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) | |
-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 0b7f2865d1..c0546a2112 100644 --- a/src/util/configuration_loader.c +++ b/src/util/configuration_loader.c @@ -24,6 +24,12 @@ * @author Christian Grothoff */ +#include "platform.h" +#include "gnunet_util_lib.h" + +#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__) + +#define LOG_STRERROR_FILE(kind,syscall,filename) GNUNET_log_from_strerror_file (kind, "util", syscall, filename) /** * Load configuration (starts with defaults, then loads * system-specific configuration). @@ -45,8 +51,10 @@ GNUNET_CONFIGURATION_load (struct GNUNET_CONFIGURATION_Handle *cfg, baseconfig = NULL; GNUNET_asprintf (&baseconfig, "%s%s", ipath, "config.d"); GNUNET_free (ipath); + if (GNUNET_SYSERR == - GNUNET_DISK_directory_scan (baseconfig, &parse_configuration_file, cfg)) + GNUNET_CONFIGURATION_load_from (cfg, + baseconfig)) { GNUNET_free (baseconfig); return GNUNET_SYSERR; /* no configuration at all found */ |