Let it compile again

This commit is contained in:
Pierre Pronchery 2014-04-27 01:46:12 +08:00
parent 7d90422bb4
commit 25b9f8bab0
3 changed files with 11 additions and 8 deletions

View File

@ -1,6 +1,5 @@
#$Id$ #$Id$
service=Splasher service=Splasher
port=4249
[call::enable] [call::enable]
ret=INT32 ret=INT32

View File

@ -1,5 +1,5 @@
/* $Id$ */ /* $Id$ */
/* Copyright (c) 2010 Pierre Pronchery <khorben@defora.org> */ /* Copyright (c) 2010-2014 Pierre Pronchery <khorben@defora.org> */
/* This file is part of DeforaOS System Splasher */ /* This file is part of DeforaOS System Splasher */
/* This program is free software: you can redistribute it and/or modify /* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -24,7 +24,7 @@
/* usage */ /* usage */
static int _usage(void) static int _usage(void)
{ {
fputs("Usage: " PACKAGE " [-L|-R]\n", stderr); fputs("Usage: " PACKAGE " [-R]\n", stderr);
return 1; return 1;
} }
@ -33,11 +33,14 @@ static int _usage(void)
int main(int argc, char * argv[]) int main(int argc, char * argv[])
{ {
int o; int o;
AppServerOptions options = ASO_LOCAL; AppServerOptions options = 0;
while((o = getopt(argc, argv, "LR")) != -1) while((o = getopt(argc, argv, "R")) != -1)
switch(o) switch(o)
{ {
case 'R':
options |= ASO_REGISTER;
break;
default: default:
return _usage(); return _usage();
} }

View File

@ -1,5 +1,5 @@
/* $Id$ */ /* $Id$ */
/* Copyright (c) 2011 Pierre Pronchery <khorben@defora.org> */ /* Copyright (c) 2010-2014 Pierre Pronchery <khorben@defora.org> */
/* This file is part of DeforaOS System Splasher */ /* This file is part of DeforaOS System Splasher */
/* This program is free software: you can redistribute it and/or modify /* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -38,7 +38,7 @@ static AppServer * _appserver;
/* splasher */ /* splasher */
int splasher(AppServerOptions options) int splasher(AppServerOptions options)
{ {
if((_appserver = appserver_new(PACKAGE, options)) == NULL) if((_appserver = appserver_new(options, PACKAGE, NULL)) == NULL)
{ {
error_print(PACKAGE); error_print(PACKAGE);
return 1; return 1;
@ -75,7 +75,8 @@ int32_t Splasher_enable(int32_t enabled)
/* Splasher_progress */ /* Splasher_progress */
int32_t Splasher_progress(uint32_t progress, char const * text) int32_t Splasher_progress(AppServerClient * client, uint32_t progress,
char const * text)
{ {
int ret = 0; int ret = 0;