diff options
| author | Christian Grothoff <christian@grothoff.org> | 2011-09-18 21:34:08 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2011-09-18 21:34:08 +0000 |
| commit | f8de0fca7d326d55424b33c87d77ff428dce61a1 (patch) | |
| tree | 982e8d1cb261ce5c5408de590635628edb488c96 /src/util | |
| parent | 486ec5be041f1072a2532b2f105c345dc620b32d (diff) | |
| download | gnunet-f8de0fca7d326d55424b33c87d77ff428dce61a1.tar.gz gnunet-f8de0fca7d326d55424b33c87d77ff428dce61a1.zip | |
fixing #1781
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/program.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util/program.c b/src/util/program.c index b64e9ae30..d89b65a39 100644 --- a/src/util/program.c +++ b/src/util/program.c | |||
| @@ -218,8 +218,7 @@ GNUNET_PROGRAM_run (int argc, char *const *argv, const char *binaryName, | |||
| 218 | if ((-1 == | 218 | if ((-1 == |
| 219 | (ret = | 219 | (ret = |
| 220 | GNUNET_GETOPT_run (binaryName, allopts, (unsigned int) argc, argv))) || | 220 | GNUNET_GETOPT_run (binaryName, allopts, (unsigned int) argc, argv))) || |
| 221 | ((GNUNET_OK != GNUNET_log_setup (lpfx, loglev, logfile)) || | 221 | (GNUNET_OK != GNUNET_log_setup (lpfx, loglev, logfile)) ) |
| 222 | (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, cc.cfgfile)))) | ||
| 223 | { | 222 | { |
| 224 | GNUNET_CONFIGURATION_destroy (cfg); | 223 | GNUNET_CONFIGURATION_destroy (cfg); |
| 225 | GNUNET_free_non_null (cc.cfgfile); | 224 | GNUNET_free_non_null (cc.cfgfile); |
| @@ -229,6 +228,7 @@ GNUNET_PROGRAM_run (int argc, char *const *argv, const char *binaryName, | |||
| 229 | GNUNET_free (lpfx); | 228 | GNUNET_free (lpfx); |
| 230 | return GNUNET_SYSERR; | 229 | return GNUNET_SYSERR; |
| 231 | } | 230 | } |
| 231 | (void) GNUNET_CONFIGURATION_load (cfg, cc.cfgfile); | ||
| 232 | GNUNET_free (allopts); | 232 | GNUNET_free (allopts); |
| 233 | GNUNET_free (lpfx); | 233 | GNUNET_free (lpfx); |
| 234 | if (GNUNET_OK == | 234 | if (GNUNET_OK == |