From f5beb3eaf163fc0bf2a4f86bd413d3ee6939cfea Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 6 Jul 2016 11:14:11 +0000 Subject: -fix misc issues --- src/namestore/plugin_namestore_sqlite.c | 2 +- .../test_namestore_api_zone_iteration_stop.c | 25 +++++++++++----------- 2 files changed, 13 insertions(+), 14 deletions(-) (limited to 'src/namestore') diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c index d6a2a2862..3710a4820 100644 --- a/src/namestore/plugin_namestore_sqlite.c +++ b/src/namestore/plugin_namestore_sqlite.c @@ -315,7 +315,7 @@ database_shutdown (struct Plugin *plugin) sqlite3_finalize (plugin->iterate_all_zones); if (NULL != plugin->zone_to_name) sqlite3_finalize (plugin->zone_to_name); - if (NULL != plugin->zone_to_name) + if (NULL != plugin->lookup_label) sqlite3_finalize (plugin->lookup_label); result = sqlite3_close (plugin->dbh); if (result == SQLITE_BUSY) diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c index 52645b5eb..36f527da0 100644 --- a/src/namestore/test_namestore_api_zone_iteration_stop.c +++ b/src/namestore/test_namestore_api_zone_iteration_stop.c @@ -365,27 +365,26 @@ empty_zone_proc (void *cls, char *hostkey_file; GNUNET_assert (nsh == cls); - if (NULL != zone) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Expected empty zone but received zone private key\n")); + if (NULL != zone) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Expected empty zone but received zone private key\n")); GNUNET_break (0); if (endbadly_task != NULL) - GNUNET_SCHEDULER_cancel (endbadly_task); + GNUNET_SCHEDULER_cancel (endbadly_task); endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); return; - } - if ((NULL != label) || (NULL != rd) || (0 != rd)) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Expected no zone content but received data\n")); + } + if ((NULL != label) || (NULL != rd) || (0 != rd_count)) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Expected no zone content but received data\n")); GNUNET_break (0); if (endbadly_task != NULL) - GNUNET_SCHEDULER_cancel (endbadly_task); + GNUNET_SCHEDULER_cancel (endbadly_task); endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); return; - } - + } zi = NULL; GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, -- cgit v1.2.3