diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-05-28 09:58:58 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-05-28 09:58:58 +0000 |
commit | fc1b9d4caffabba3411a27f62f9ea309a2cf8edc (patch) | |
tree | 1531a48624abbf478a27a1780e243c1059a7a938 /src/util/configuration_loader.c | |
parent | b1294ac8f7a3cf9d53334485b7ff2d97d3fb4ab7 (diff) | |
download | gnunet-fc1b9d4caffabba3411a27f62f9ea309a2cf8edc.tar.gz gnunet-fc1b9d4caffabba3411a27f62f9ea309a2cf8edc.zip |
-fix ftbfs
Diffstat (limited to 'src/util/configuration_loader.c')
-rw-r--r-- | src/util/configuration_loader.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/util/configuration_loader.c b/src/util/configuration_loader.c index 0b7f2865d..c0546a211 100644 --- a/src/util/configuration_loader.c +++ b/src/util/configuration_loader.c | |||
@@ -24,6 +24,12 @@ | |||
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "platform.h" | ||
28 | #include "gnunet_util_lib.h" | ||
29 | |||
30 | #define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__) | ||
31 | |||
32 | #define LOG_STRERROR_FILE(kind,syscall,filename) GNUNET_log_from_strerror_file (kind, "util", syscall, filename) | ||
27 | /** | 33 | /** |
28 | * Load configuration (starts with defaults, then loads | 34 | * Load configuration (starts with defaults, then loads |
29 | * system-specific configuration). | 35 | * system-specific configuration). |
@@ -45,8 +51,10 @@ GNUNET_CONFIGURATION_load (struct GNUNET_CONFIGURATION_Handle *cfg, | |||
45 | baseconfig = NULL; | 51 | baseconfig = NULL; |
46 | GNUNET_asprintf (&baseconfig, "%s%s", ipath, "config.d"); | 52 | GNUNET_asprintf (&baseconfig, "%s%s", ipath, "config.d"); |
47 | GNUNET_free (ipath); | 53 | GNUNET_free (ipath); |
54 | |||
48 | if (GNUNET_SYSERR == | 55 | if (GNUNET_SYSERR == |
49 | GNUNET_DISK_directory_scan (baseconfig, &parse_configuration_file, cfg)) | 56 | GNUNET_CONFIGURATION_load_from (cfg, |
57 | baseconfig)) | ||
50 | { | 58 | { |
51 | GNUNET_free (baseconfig); | 59 | GNUNET_free (baseconfig); |
52 | return GNUNET_SYSERR; /* no configuration at all found */ | 60 | return GNUNET_SYSERR; /* no configuration at all found */ |