diff options
Diffstat (limited to 'src/namestore')
-rw-r--r-- | src/namestore/gnunet-namestore.c | 4 | ||||
-rw-r--r-- | src/namestore/gnunet-service-namestore.c | 4 | ||||
-rw-r--r-- | src/namestore/plugin_namestore_sqlite.c | 2 | ||||
-rw-r--r-- | src/namestore/plugin_rest_namestore.c | 4 | ||||
-rw-r--r-- | src/namestore/test_namestore_api_lookup_nick.c | 2 | ||||
-rw-r--r-- | src/namestore/test_namestore_api_monitoring.c | 6 | ||||
-rw-r--r-- | src/namestore/test_namestore_api_zone_iteration.c | 6 | ||||
-rw-r--r-- | src/namestore/test_namestore_api_zone_iteration_nick.c | 6 | ||||
-rw-r--r-- | src/namestore/test_namestore_api_zone_iteration_specific_zone.c | 6 | ||||
-rw-r--r-- | src/namestore/test_namestore_api_zone_iteration_stop.c | 6 |
10 files changed, 23 insertions, 23 deletions
diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c index f438de136..704a4abf7 100644 --- a/src/namestore/gnunet-namestore.c +++ b/src/namestore/gnunet-namestore.c | |||
@@ -878,7 +878,7 @@ del_monitor (void *cls, | |||
878 | rd[i].data_size)))) || | 878 | rd[i].data_size)))) || |
879 | (0 == strcmp (vs, value))))) | 879 | (0 == strcmp (vs, value))))) |
880 | rdx[rd_left++] = rd[i]; | 880 | rdx[rd_left++] = rd[i]; |
881 | GNUNET_free_non_null (vs); | 881 | GNUNET_free (vs); |
882 | } | 882 | } |
883 | if (rd_count == rd_left) | 883 | if (rd_count == rd_left) |
884 | { | 884 | { |
@@ -1307,7 +1307,7 @@ identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego) | |||
1307 | return; | 1307 | return; |
1308 | } | 1308 | } |
1309 | zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (ego); | 1309 | zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (ego); |
1310 | GNUNET_free_non_null (ego_name); | 1310 | GNUNET_free (ego_name); |
1311 | ego_name = NULL; | 1311 | ego_name = NULL; |
1312 | run_with_zone_pkey (cfg); | 1312 | run_with_zone_pkey (cfg); |
1313 | } | 1313 | } |
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c index c57f15f65..ede566d40 100644 --- a/src/namestore/gnunet-service-namestore.c +++ b/src/namestore/gnunet-service-namestore.c | |||
@@ -540,7 +540,7 @@ cache_nick (const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | |||
540 | break; | 540 | break; |
541 | } | 541 | } |
542 | } | 542 | } |
543 | GNUNET_free_non_null (oldest->rd); | 543 | GNUNET_free (oldest->rd); |
544 | oldest->zone = *zone; | 544 | oldest->zone = *zone; |
545 | if (NULL != nick) | 545 | if (NULL != nick) |
546 | { | 546 | { |
@@ -1392,7 +1392,7 @@ handle_record_lookup (void *cls, const struct LabelLookupMessage *ll_msg) | |||
1392 | GNUNET_memcpy (&llr_msg[1], name_tmp, name_len); | 1392 | GNUNET_memcpy (&llr_msg[1], name_tmp, name_len); |
1393 | GNUNET_memcpy (&res_name[name_len], rlc.res_rd, rlc.rd_ser_len); | 1393 | GNUNET_memcpy (&res_name[name_len], rlc.res_rd, rlc.rd_ser_len); |
1394 | GNUNET_MQ_send (nc->mq, env); | 1394 | GNUNET_MQ_send (nc->mq, env); |
1395 | GNUNET_free_non_null (rlc.res_rd); | 1395 | GNUNET_free (rlc.res_rd); |
1396 | } | 1396 | } |
1397 | 1397 | ||
1398 | 1398 | ||
diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c index a909221e2..45fb782f7 100644 --- a/src/namestore/plugin_namestore_sqlite.c +++ b/src/namestore/plugin_namestore_sqlite.c | |||
@@ -296,7 +296,7 @@ database_shutdown (struct Plugin *plugin) | |||
296 | GNUNET_ERROR_TYPE_ERROR, | 296 | GNUNET_ERROR_TYPE_ERROR, |
297 | "sqlite3_close"); | 297 | "sqlite3_close"); |
298 | 298 | ||
299 | GNUNET_free_non_null (plugin->fn); | 299 | GNUNET_free (plugin->fn); |
300 | } | 300 | } |
301 | 301 | ||
302 | 302 | ||
diff --git a/src/namestore/plugin_rest_namestore.c b/src/namestore/plugin_rest_namestore.c index 95b9b428f..4a05b2833 100644 --- a/src/namestore/plugin_rest_namestore.c +++ b/src/namestore/plugin_rest_namestore.c | |||
@@ -491,7 +491,7 @@ namestore_list_finished (void *cls) | |||
491 | resp = GNUNET_REST_create_response (result_str); | 491 | resp = GNUNET_REST_create_response (result_str); |
492 | MHD_add_response_header (resp, "Content-Type", "application/json"); | 492 | MHD_add_response_header (resp, "Content-Type", "application/json"); |
493 | handle->proc (handle->proc_cls, resp, MHD_HTTP_OK); | 493 | handle->proc (handle->proc_cls, resp, MHD_HTTP_OK); |
494 | GNUNET_free_non_null (result_str); | 494 | GNUNET_free (result_str); |
495 | GNUNET_SCHEDULER_add_now (&cleanup_handle, handle); | 495 | GNUNET_SCHEDULER_add_now (&cleanup_handle, handle); |
496 | } | 496 | } |
497 | 497 | ||
@@ -1109,7 +1109,7 @@ libgnunet_plugin_rest_namestore_done (void *cls) | |||
1109 | 1109 | ||
1110 | plugin->cfg = NULL; | 1110 | plugin->cfg = NULL; |
1111 | 1111 | ||
1112 | GNUNET_free_non_null (allow_methods); | 1112 | GNUNET_free (allow_methods); |
1113 | GNUNET_free (api); | 1113 | GNUNET_free (api); |
1114 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Namestore REST plugin is finished\n"); | 1114 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Namestore REST plugin is finished\n"); |
1115 | return NULL; | 1115 | return NULL; |
diff --git a/src/namestore/test_namestore_api_lookup_nick.c b/src/namestore/test_namestore_api_lookup_nick.c index 628e76254..2fbd9d7cb 100644 --- a/src/namestore/test_namestore_api_lookup_nick.c +++ b/src/namestore/test_namestore_api_lookup_nick.c | |||
@@ -58,7 +58,7 @@ static const char *name = "d"; | |||
58 | static void | 58 | static void |
59 | cleanup () | 59 | cleanup () |
60 | { | 60 | { |
61 | GNUNET_free_non_null ((void *) rd_orig.data); | 61 | GNUNET_free ((void *) rd_orig.data); |
62 | if (NULL != nsh) | 62 | if (NULL != nsh) |
63 | { | 63 | { |
64 | GNUNET_NAMESTORE_disconnect (nsh); | 64 | GNUNET_NAMESTORE_disconnect (nsh); |
diff --git a/src/namestore/test_namestore_api_monitoring.c b/src/namestore/test_namestore_api_monitoring.c index cc00adf44..3f1be1403 100644 --- a/src/namestore/test_namestore_api_monitoring.c +++ b/src/namestore/test_namestore_api_monitoring.c | |||
@@ -88,9 +88,9 @@ do_shutdown () | |||
88 | GNUNET_NAMESTORE_disconnect (nsh); | 88 | GNUNET_NAMESTORE_disconnect (nsh); |
89 | nsh = NULL; | 89 | nsh = NULL; |
90 | } | 90 | } |
91 | GNUNET_free_non_null (s_name_1); | 91 | GNUNET_free (s_name_1); |
92 | GNUNET_free_non_null (s_name_2); | 92 | GNUNET_free (s_name_2); |
93 | GNUNET_free_non_null (s_name_3); | 93 | GNUNET_free (s_name_3); |
94 | 94 | ||
95 | if (s_rd_1 != NULL) | 95 | if (s_rd_1 != NULL) |
96 | { | 96 | { |
diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c index a363ee28d..5d02b9e49 100644 --- a/src/namestore/test_namestore_api_zone_iteration.c +++ b/src/namestore/test_namestore_api_zone_iteration.c | |||
@@ -88,9 +88,9 @@ end (void *cls) | |||
88 | GNUNET_SCHEDULER_cancel (endbadly_task); | 88 | GNUNET_SCHEDULER_cancel (endbadly_task); |
89 | endbadly_task = NULL; | 89 | endbadly_task = NULL; |
90 | } | 90 | } |
91 | GNUNET_free_non_null (s_name_1); | 91 | GNUNET_free (s_name_1); |
92 | GNUNET_free_non_null (s_name_2); | 92 | GNUNET_free (s_name_2); |
93 | GNUNET_free_non_null (s_name_3); | 93 | GNUNET_free (s_name_3); |
94 | if (NULL != s_rd_1) | 94 | if (NULL != s_rd_1) |
95 | { | 95 | { |
96 | GNUNET_free_nz ((void *) s_rd_1->data); | 96 | GNUNET_free_nz ((void *) s_rd_1->data); |
diff --git a/src/namestore/test_namestore_api_zone_iteration_nick.c b/src/namestore/test_namestore_api_zone_iteration_nick.c index 1ebdfd073..4e54a05d2 100644 --- a/src/namestore/test_namestore_api_zone_iteration_nick.c +++ b/src/namestore/test_namestore_api_zone_iteration_nick.c | |||
@@ -82,9 +82,9 @@ end (void *cls) | |||
82 | GNUNET_NAMESTORE_disconnect (nsh); | 82 | GNUNET_NAMESTORE_disconnect (nsh); |
83 | nsh = NULL; | 83 | nsh = NULL; |
84 | } | 84 | } |
85 | GNUNET_free_non_null (s_name_1); | 85 | GNUNET_free (s_name_1); |
86 | GNUNET_free_non_null (s_name_2); | 86 | GNUNET_free (s_name_2); |
87 | GNUNET_free_non_null (s_name_3); | 87 | GNUNET_free (s_name_3); |
88 | 88 | ||
89 | if (s_rd_1 != NULL) | 89 | if (s_rd_1 != NULL) |
90 | { | 90 | { |
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 0534da001..30920713f 100644 --- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c +++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c | |||
@@ -88,9 +88,9 @@ end (void *cls) | |||
88 | GNUNET_SCHEDULER_cancel (endbadly_task); | 88 | GNUNET_SCHEDULER_cancel (endbadly_task); |
89 | endbadly_task = NULL; | 89 | endbadly_task = NULL; |
90 | } | 90 | } |
91 | GNUNET_free_non_null (s_name_1); | 91 | GNUNET_free (s_name_1); |
92 | GNUNET_free_non_null (s_name_2); | 92 | GNUNET_free (s_name_2); |
93 | GNUNET_free_non_null (s_name_3); | 93 | GNUNET_free (s_name_3); |
94 | if (s_rd_1 != NULL) | 94 | if (s_rd_1 != NULL) |
95 | { | 95 | { |
96 | GNUNET_free_nz ((void *) s_rd_1->data); | 96 | GNUNET_free_nz ((void *) s_rd_1->data); |
diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c index b71a8789c..bdcdd1706 100644 --- a/src/namestore/test_namestore_api_zone_iteration_stop.c +++ b/src/namestore/test_namestore_api_zone_iteration_stop.c | |||
@@ -75,9 +75,9 @@ end (void *cls) | |||
75 | GNUNET_NAMESTORE_disconnect (nsh); | 75 | GNUNET_NAMESTORE_disconnect (nsh); |
76 | nsh = NULL; | 76 | nsh = NULL; |
77 | } | 77 | } |
78 | GNUNET_free_non_null (s_name_1); | 78 | GNUNET_free (s_name_1); |
79 | GNUNET_free_non_null (s_name_2); | 79 | GNUNET_free (s_name_2); |
80 | GNUNET_free_non_null (s_name_3); | 80 | GNUNET_free (s_name_3); |
81 | if (s_rd_1 != NULL) | 81 | if (s_rd_1 != NULL) |
82 | { | 82 | { |
83 | GNUNET_free_nz ((void *) s_rd_1->data); | 83 | GNUNET_free_nz ((void *) s_rd_1->data); |