diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-12-17 03:46:02 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-12-17 03:46:02 +0000 |
commit | 087cd170eca2230d08fd74f6e47fde57bf87988a (patch) | |
tree | 09397cb5d93ed514701d077393d6cd481ba4f4ce /src | |
parent | e5d413fb46ab35dd4322b2a7ba6c2c8f26de6410 (diff) | |
download | gnunet-087cd170eca2230d08fd74f6e47fde57bf87988a.tar.gz gnunet-087cd170eca2230d08fd74f6e47fde57bf87988a.zip |
-check rval
Diffstat (limited to 'src')
-rw-r--r-- | src/namestore/test_namestore_api_zone_iteration_nick.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/namestore/test_namestore_api_zone_iteration_nick.c b/src/namestore/test_namestore_api_zone_iteration_nick.c index 9b3b5acf5..6ea4e39c0 100644 --- a/src/namestore/test_namestore_api_zone_iteration_nick.c +++ b/src/namestore/test_namestore_api_zone_iteration_nick.c | |||
@@ -157,6 +157,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
157 | nsh = NULL; | 157 | nsh = NULL; |
158 | } | 158 | } |
159 | 159 | ||
160 | |||
160 | static int | 161 | static int |
161 | check_zone_1 (const char *label, unsigned int rd_count, | 162 | check_zone_1 (const char *label, unsigned int rd_count, |
162 | const struct GNUNET_GNSRECORD_Data *rd) | 163 | const struct GNUNET_GNSRECORD_Data *rd) |
@@ -314,6 +315,7 @@ create_record (unsigned int count) | |||
314 | return rd; | 315 | return rd; |
315 | } | 316 | } |
316 | 317 | ||
318 | |||
317 | static void | 319 | static void |
318 | nick_2_cont (void *cls, int32_t success, const char *emsg) | 320 | nick_2_cont (void *cls, int32_t success, const char *emsg) |
319 | { | 321 | { |
@@ -361,13 +363,9 @@ nick_1_cont (void *cls, int32_t success, const char *emsg) | |||
361 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 363 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
362 | _("Namestore cannot store no block\n")); | 364 | _("Namestore cannot store no block\n")); |
363 | } | 365 | } |
364 | |||
365 | |||
366 | |||
367 | } | 366 | } |
368 | 367 | ||
369 | 368 | ||
370 | |||
371 | /** | 369 | /** |
372 | * Callback called from the zone iterator when we iterate over | 370 | * Callback called from the zone iterator when we iterate over |
373 | * the empty zone. Check that we got no records and then | 371 | * the empty zone. Check that we got no records and then |
@@ -434,7 +432,11 @@ run (void *cls, | |||
434 | struct GNUNET_TESTING_Peer *peer) | 432 | struct GNUNET_TESTING_Peer *peer) |
435 | { | 433 | { |
436 | directory = NULL; | 434 | directory = NULL; |
437 | GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME", &directory); | 435 | GNUNET_assert (GNUNET_OK == |
436 | GNUNET_CONFIGURATION_get_value_string (cfg, | ||
437 | "PATHS", | ||
438 | "GNUNET_TEST_HOME", | ||
439 | &directory)); | ||
438 | GNUNET_DISK_directory_remove (directory); | 440 | GNUNET_DISK_directory_remove (directory); |
439 | 441 | ||
440 | endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT, &endbadly, NULL); | 442 | endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT, &endbadly, NULL); |
@@ -446,7 +448,8 @@ run (void *cls, | |||
446 | NULL, &empty_zone_proc, nsh); | 448 | NULL, &empty_zone_proc, nsh); |
447 | if (NULL == zi) | 449 | if (NULL == zi) |
448 | { | 450 | { |
449 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone iterator\n"); | 451 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
452 | "Failed to create zone iterator\n"); | ||
450 | GNUNET_break (0); | 453 | GNUNET_break (0); |
451 | GNUNET_SCHEDULER_cancel (endbadly_task); | 454 | GNUNET_SCHEDULER_cancel (endbadly_task); |
452 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 455 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |