DeforaOS/libApp
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2016-09-13 22:52:05 +02:00
parent 8654a13065
commit 76f2febb8f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/appbroker.c
View File

@ -22,7 +22,7 @@
#include <System.h> #include <System.h>
#include "App.h" #include "App.h"
#define APPBROKER_PROGNAME "AppBroker" #define PROGNAME_APPBROKER "AppBroker"
/* AppBroker */ /* AppBroker */
@ -78,13 +78,13 @@ static int _appbroker(AppBrokerPrefs * prefs, char const * filename)
appbroker.prefs.mode = ATM_SERVER; appbroker.prefs.mode = ATM_SERVER;
} }
if((appbroker.config = config_new()) == NULL) if((appbroker.config = config_new()) == NULL)
return error_print(APPBROKER_PROGNAME); return error_print(PROGNAME_APPBROKER);
if(config_load(appbroker.config, filename) != 0 if(config_load(appbroker.config, filename) != 0
|| (appbroker.prefix = config_get(appbroker.config, || (appbroker.prefix = config_get(appbroker.config,
NULL, "service")) == NULL) NULL, "service")) == NULL)
{ {
config_delete(appbroker.config); config_delete(appbroker.config);
return error_print(APPBROKER_PROGNAME); return error_print(PROGNAME_APPBROKER);
} }
appbroker.fp = NULL; appbroker.fp = NULL;
if(_appbroker_do(&appbroker, appbroker.prefs.mode) == 0 if(_appbroker_do(&appbroker, appbroker.prefs.mode) == 0
@ -96,7 +96,7 @@ static int _appbroker(AppBrokerPrefs * prefs, char const * filename)
== NULL) == NULL)
{ {
config_delete(appbroker.config); config_delete(appbroker.config);
return error_set_print(APPBROKER_PROGNAME, 1, "%s: %s", return error_set_print(PROGNAME_APPBROKER, 1, "%s: %s",
appbroker.prefs.outfile, appbroker.prefs.outfile,
strerror(errno)); strerror(errno));
} }
@ -233,7 +233,7 @@ static int _appbroker_foreach_call(char const * key, Hash * value, void * data)
if((p = hash_get(value, "ret")) == NULL) if((p = hash_get(value, "ret")) == NULL)
p = "VOID"; p = "VOID";
if((p = _appbroker_ctype(p)) == NULL) if((p = _appbroker_ctype(p)) == NULL)
appbroker->error = -error_set_print(APPBROKER_PROGNAME, 1, appbroker->error = -error_set_print(PROGNAME_APPBROKER, 1,
"%s: %s", key, "Invalid return type for call"); "%s: %s", key, "Invalid return type for call");
if(appbroker->fp != NULL) if(appbroker->fp != NULL)
fprintf(appbroker->fp, "%s%s%s%s%s%s", p, " ", fprintf(appbroker->fp, "%s%s%s%s%s%s", p, " ",
@ -297,7 +297,7 @@ static int _appbroker_foreach_callback(char const * key, Hash * value,
if((p = hash_get(value, "ret")) == NULL) if((p = hash_get(value, "ret")) == NULL)
p = "VOID"; p = "VOID";
if((p = _appbroker_ctype(p)) == NULL) if((p = _appbroker_ctype(p)) == NULL)
appbroker->error = -error_set_print(APPBROKER_PROGNAME, 1, appbroker->error = -error_set_print(PROGNAME_APPBROKER, 1,
"%s: %s", key, "Unknown return type for" "%s: %s", key, "Unknown return type for"
" callback"); " callback");
if(appbroker->fp != NULL) if(appbroker->fp != NULL)
@ -356,7 +356,7 @@ static void _appbroker_tail(AppBroker * appbroker)
/* usage */ /* usage */
static int _usage(void) static int _usage(void)
{ {
fputs("Usage: " APPBROKER_PROGNAME " [-cns][-o outfile] filename\n" fputs("Usage: " PROGNAME_APPBROKER " [-cns][-o outfile] filename\n"
" -n Only check for errors (dry-run)\n", stderr); " -n Only check for errors (dry-run)\n", stderr);
return 1; return 1;
} }