aboutsummaryrefslogtreecommitdiff
path: root/src/namestore
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-09-25 21:42:11 +0000
committerChristian Grothoff <christian@grothoff.org>2013-09-25 21:42:11 +0000
commit78ad97319349e9881653684f276dd620a0a423e9 (patch)
treecded8f0063f6848429706a36bd51174e62417b7e /src/namestore
parentb968c5926b205c3cdd467474753746ef21522b32 (diff)
downloadgnunet-78ad97319349e9881653684f276dd620a0a423e9.tar.gz
gnunet-78ad97319349e9881653684f276dd620a0a423e9.zip
-misc fixes based on cppcheck
Diffstat (limited to 'src/namestore')
-rw-r--r--src/namestore/test_namestore_api_zone_iteration.c24
-rw-r--r--src/namestore/test_namestore_api_zone_iteration_specific_zone.c2
2 files changed, 13 insertions, 13 deletions
diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c
index ae79fe09c..dbe701fd8 100644
--- a/src/namestore/test_namestore_api_zone_iteration.c
+++ b/src/namestore/test_namestore_api_zone_iteration.c
@@ -354,26 +354,26 @@ empty_zone_proc (void *cls,
354 char *hostkey_file; 354 char *hostkey_file;
355 355
356 GNUNET_assert (nsh == cls); 356 GNUNET_assert (nsh == cls);
357 if (NULL != zone) 357 if (NULL != zone)
358 { 358 {
359 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 359 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
360 _("Expected empty zone but received zone private key\n")); 360 _("Expected empty zone but received zone private key\n"));
361 GNUNET_break (0); 361 GNUNET_break (0);
362 if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) 362 if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
363 GNUNET_SCHEDULER_cancel (endbadly_task); 363 GNUNET_SCHEDULER_cancel (endbadly_task);
364 endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); 364 endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
365 return; 365 return;
366 } 366 }
367 if ((NULL != label) || (NULL != rd) || (0 != rd)) 367 if ((NULL != label) || (NULL != rd) || (0 != rd_count))
368 { 368 {
369 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 369 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
370 _("Expected no zone content but received data\n")); 370 _("Expected no zone content but received data\n"));
371 GNUNET_break (0); 371 GNUNET_break (0);
372 if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) 372 if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
373 GNUNET_SCHEDULER_cancel (endbadly_task); 373 GNUNET_SCHEDULER_cancel (endbadly_task);
374 endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); 374 endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
375 return; 375 return;
376 } 376 }
377 377
378 378
379 zi = NULL; 379 zi = NULL;
diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
index 299a8bbd8..2b96d501e 100644
--- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
+++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
@@ -342,7 +342,7 @@ empty_zone_proc (void *cls,
342 endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); 342 endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
343 return; 343 return;
344 } 344 }
345 if ((NULL != label) || (NULL != rd) || (0 != rd)) 345 if ((NULL != label) || (NULL != rd) || (0 != rd_count))
346 { 346 {
347 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 347 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
348 _("Expected no zone content but received data\n")); 348 _("Expected no zone content but received data\n"));