diff options
Diffstat (limited to 'src/util/program.c')
-rw-r--r-- | src/util/program.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/util/program.c b/src/util/program.c index cccb7db73..f1e95477d 100644 --- a/src/util/program.c +++ b/src/util/program.c | |||
@@ -124,9 +124,7 @@ cmd_sorter (__const void *a1, __const void *a2) | |||
124 | * @return GNUNET_SYSERR on error, GNUNET_OK on success | 124 | * @return GNUNET_SYSERR on error, GNUNET_OK on success |
125 | */ | 125 | */ |
126 | int | 126 | int |
127 | GNUNET_PROGRAM_run (int argc, | 127 | GNUNET_PROGRAM_run (int argc, char *const *argv, const char *binaryName, |
128 | char *const *argv, | ||
129 | const char *binaryName, | ||
130 | const char *binaryHelp, | 128 | const char *binaryHelp, |
131 | const struct GNUNET_GETOPT_CommandLineOption *options, | 129 | const struct GNUNET_GETOPT_CommandLineOption *options, |
132 | GNUNET_PROGRAM_Main task, void *task_cls) | 130 | GNUNET_PROGRAM_Main task, void *task_cls) |
@@ -217,13 +215,10 @@ GNUNET_PROGRAM_run (int argc, | |||
217 | lpfx = GNUNET_strdup (binaryName); | 215 | lpfx = GNUNET_strdup (binaryName); |
218 | if (NULL != (spc = strstr (lpfx, " "))) | 216 | if (NULL != (spc = strstr (lpfx, " "))) |
219 | *spc = '\0'; | 217 | *spc = '\0'; |
220 | if ((-1 == (ret = GNUNET_GETOPT_run (binaryName, | 218 | if ((-1 == |
221 | allopts, | 219 | (ret = |
222 | (unsigned int) argc, argv))) || | 220 | GNUNET_GETOPT_run (binaryName, allopts, (unsigned int) argc, argv))) || |
223 | ((GNUNET_OK != | 221 | ((GNUNET_OK != GNUNET_log_setup (lpfx, loglev, logfile)) || |
224 | GNUNET_log_setup (lpfx, | ||
225 | loglev, | ||
226 | logfile)) || | ||
227 | (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, cc.cfgfile)))) | 222 | (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, cc.cfgfile)))) |
228 | { | 223 | { |
229 | GNUNET_CONFIGURATION_destroy (cfg); | 224 | GNUNET_CONFIGURATION_destroy (cfg); |