diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-12-11 10:21:39 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-12-11 10:21:39 +0100 |
commit | ee10b40c55c154400bbefd13175bd8b280cb7798 (patch) | |
tree | d475fcde922f4a5e413fb4b76c8784eb48fe71d3 /src/util/configuration.c | |
parent | 70ae2bd54ee0ff610d95a63856f38395920b804d (diff) | |
download | gnunet-ee10b40c55c154400bbefd13175bd8b280cb7798.tar.gz gnunet-ee10b40c55c154400bbefd13175bd8b280cb7798.zip |
fail hard if configuration file specified via -c does not exist (in all services and programs)
Diffstat (limited to 'src/util/configuration.c')
-rw-r--r-- | src/util/configuration.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/util/configuration.c b/src/util/configuration.c index 197c664db..d61b9c27e 100644 --- a/src/util/configuration.c +++ b/src/util/configuration.c | |||
@@ -945,7 +945,7 @@ GNUNET_CONFIGURATION_get_value_number (const struct GNUNET_CONFIGURATION_Handle | |||
945 | number, | 945 | number, |
946 | dummy)) | 946 | dummy)) |
947 | return GNUNET_SYSERR; | 947 | return GNUNET_SYSERR; |
948 | return GNUNET_OK; | 948 | return GNUNET_OK; |
949 | } | 949 | } |
950 | 950 | ||
951 | 951 | ||
@@ -966,7 +966,7 @@ GNUNET_CONFIGURATION_get_value_float (const struct GNUNET_CONFIGURATION_Handle | |||
966 | { | 966 | { |
967 | struct ConfigEntry *e; | 967 | struct ConfigEntry *e; |
968 | char dummy[2]; | 968 | char dummy[2]; |
969 | 969 | ||
970 | if (NULL == (e = find_entry (cfg, section, option))) | 970 | if (NULL == (e = find_entry (cfg, section, option))) |
971 | return GNUNET_SYSERR; | 971 | return GNUNET_SYSERR; |
972 | if (NULL == e->val) | 972 | if (NULL == e->val) |
@@ -1748,7 +1748,9 @@ GNUNET_CONFIGURATION_load_from (struct GNUNET_CONFIGURATION_Handle *cfg, | |||
1748 | const char *defaults_d) | 1748 | const char *defaults_d) |
1749 | { | 1749 | { |
1750 | if (GNUNET_SYSERR == | 1750 | if (GNUNET_SYSERR == |
1751 | GNUNET_DISK_directory_scan (defaults_d, &parse_configuration_file, cfg)) | 1751 | GNUNET_DISK_directory_scan (defaults_d, |
1752 | &parse_configuration_file, | ||
1753 | cfg)) | ||
1752 | return GNUNET_SYSERR; /* no configuration at all found */ | 1754 | return GNUNET_SYSERR; /* no configuration at all found */ |
1753 | return GNUNET_OK; | 1755 | return GNUNET_OK; |
1754 | } | 1756 | } |