diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/util/configuration.c | 4 | ||||
-rw-r--r-- | src/util/disk.c | 2 | ||||
-rw-r--r-- | src/util/test_configuration.c | 2 | ||||
-rw-r--r-- | src/util/test_disk.c | 2 | ||||
-rw-r--r-- | src/util/test_pseudonym.c | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/util/configuration.c b/src/util/configuration.c index 0d056bf33..41eeeb461 100644 --- a/src/util/configuration.c +++ b/src/util/configuration.c | |||
@@ -209,7 +209,7 @@ GNUNET_CONFIGURATION_parse (struct GNUNET_CONFIGURATION_Handle *cfg, | |||
209 | if (1 == sscanf (line, "@INLINE@ %191[^\n]", value)) | 209 | if (1 == sscanf (line, "@INLINE@ %191[^\n]", value)) |
210 | { | 210 | { |
211 | /* @INLINE@ value */ | 211 | /* @INLINE@ value */ |
212 | if (0 != GNUNET_CONFIGURATION_parse (cfg, value)) | 212 | if (GNUNET_OK != GNUNET_CONFIGURATION_parse (cfg, value)) |
213 | ret = GNUNET_SYSERR; /* failed to parse included config */ | 213 | ret = GNUNET_SYSERR; /* failed to parse included config */ |
214 | } | 214 | } |
215 | else if (1 == sscanf (line, "[%99[^]]]", value)) | 215 | else if (1 == sscanf (line, "[%99[^]]]", value)) |
@@ -1140,7 +1140,7 @@ GNUNET_CONFIGURATION_load (struct GNUNET_CONFIGURATION_Handle *cfg, | |||
1140 | (!((filename == NULL) || | 1140 | (!((filename == NULL) || |
1141 | (GNUNET_OK == GNUNET_CONFIGURATION_parse (cfg, filename))))) | 1141 | (GNUNET_OK == GNUNET_CONFIGURATION_parse (cfg, filename))))) |
1142 | { | 1142 | { |
1143 | GNUNET_free (baseconfig); | 1143 | GNUNET_free (baseconfig); |
1144 | return GNUNET_SYSERR; | 1144 | return GNUNET_SYSERR; |
1145 | } | 1145 | } |
1146 | GNUNET_free (baseconfig); | 1146 | GNUNET_free (baseconfig); |
diff --git a/src/util/disk.c b/src/util/disk.c index 79b1b64a8..6512d9945 100644 --- a/src/util/disk.c +++ b/src/util/disk.c | |||
@@ -911,7 +911,7 @@ GNUNET_DISK_directory_iterator_start (struct GNUNET_SCHEDULER_Handle *sched, | |||
911 | static int | 911 | static int |
912 | remove_helper (void *unused, const char *fn) | 912 | remove_helper (void *unused, const char *fn) |
913 | { | 913 | { |
914 | GNUNET_DISK_directory_remove (fn); | 914 | (void) GNUNET_DISK_directory_remove (fn); |
915 | return GNUNET_OK; | 915 | return GNUNET_OK; |
916 | } | 916 | } |
917 | 917 | ||
diff --git a/src/util/test_configuration.c b/src/util/test_configuration.c index 9ddd7b3e6..7c17ecf21 100644 --- a/src/util/test_configuration.c +++ b/src/util/test_configuration.c | |||
@@ -231,7 +231,7 @@ checkDiffs (struct GNUNET_CONFIGURATION_Handle *cfgDefault, int option) | |||
231 | 231 | ||
232 | /* Compare the dumped configuration with modifications done */ | 232 | /* Compare the dumped configuration with modifications done */ |
233 | cfg = GNUNET_CONFIGURATION_create (); | 233 | cfg = GNUNET_CONFIGURATION_create (); |
234 | GNUNET_CONFIGURATION_parse (cfg, diffsFileName); | 234 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_parse (cfg, diffsFileName)); |
235 | remove (diffsFileName); | 235 | remove (diffsFileName); |
236 | cbData.callBackOption = COMPARE; | 236 | cbData.callBackOption = COMPARE; |
237 | cbData.cfgDiffs = cfgDiffs; | 237 | cbData.cfgDiffs = cfgDiffs; |
diff --git a/src/util/test_disk.c b/src/util/test_disk.c index c84ec812a..f06ffacaf 100644 --- a/src/util/test_disk.c +++ b/src/util/test_disk.c | |||
@@ -211,7 +211,7 @@ testGetHome () | |||
211 | GNUNET_CONFIGURATION_destroy (cfg); | 211 | GNUNET_CONFIGURATION_destroy (cfg); |
212 | ret = strcmp ("/tmp/test-gnunet-disk-a/b/c/d/e", fn); | 212 | ret = strcmp ("/tmp/test-gnunet-disk-a/b/c/d/e", fn); |
213 | GNUNET_free (fn); | 213 | GNUNET_free (fn); |
214 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-disk-a"); | 214 | GNUNET_break (GNUNET_OK == GNUNET_DISK_directory_remove ("/tmp/test-gnunet-disk-a")); |
215 | return ret; | 215 | return ret; |
216 | } | 216 | } |
217 | 217 | ||
diff --git a/src/util/test_pseudonym.c b/src/util/test_pseudonym.c index bdac7d90d..31e722574 100644 --- a/src/util/test_pseudonym.c +++ b/src/util/test_pseudonym.c | |||
@@ -111,7 +111,7 @@ main (int argc, char *argv[]) | |||
111 | GNUNET_log_setup ("test-pseudonym", "WARNING", NULL); | 111 | GNUNET_log_setup ("test-pseudonym", "WARNING", NULL); |
112 | ok = GNUNET_YES; | 112 | ok = GNUNET_YES; |
113 | GNUNET_CRYPTO_random_disable_entropy_gathering (); | 113 | GNUNET_CRYPTO_random_disable_entropy_gathering (); |
114 | GNUNET_DISK_directory_remove ("/tmp/gnunet-pseudonym-test"); | 114 | (void) GNUNET_DISK_directory_remove ("/tmp/gnunet-pseudonym-test"); |
115 | cfg = GNUNET_CONFIGURATION_create (); | 115 | cfg = GNUNET_CONFIGURATION_create (); |
116 | if (-1 == GNUNET_CONFIGURATION_parse (cfg, "test_pseudonym_data.conf")) | 116 | if (-1 == GNUNET_CONFIGURATION_parse (cfg, "test_pseudonym_data.conf")) |
117 | { | 117 | { |
@@ -180,7 +180,7 @@ FAILURE: | |||
180 | GNUNET_PSEUDONYM_discovery_callback_unregister (¬i_callback, ¬iCount); | 180 | GNUNET_PSEUDONYM_discovery_callback_unregister (¬i_callback, ¬iCount); |
181 | GNUNET_CONTAINER_meta_data_destroy (meta); | 181 | GNUNET_CONTAINER_meta_data_destroy (meta); |
182 | GNUNET_CONFIGURATION_destroy (cfg); | 182 | GNUNET_CONFIGURATION_destroy (cfg); |
183 | GNUNET_DISK_directory_remove ("/tmp/gnunet-pseudonym-test"); | 183 | GNUNET_break (GNUNET_OK == GNUNET_DISK_directory_remove ("/tmp/gnunet-pseudonym-test")); |
184 | return (ok == GNUNET_YES) ? 0 : 1; | 184 | return (ok == GNUNET_YES) ? 0 : 1; |
185 | } | 185 | } |
186 | 186 | ||