removing GNUNET_CRYPTO_ecc_key_free, use GNUNET_free directly instead

author: Christian Grothoff <christian@grothoff.org> 2013-08-21 15:34:18 +0000
committer: Christian Grothoff <christian@grothoff.org> 2013-08-21 15:34:18 +0000
commit: 65e91346db9fe4ca1b1ff6516872454c468eb7f2 (patch)
tree: 4228cfb2c3b628f6dd011f8b73075ecb86343217 /src/namestore
parent: 47386fdbe2b5945fc2c319ef6899e3b67157d04f (diff)
download: gnunet-65e91346db9fe4ca1b1ff6516872454c468eb7f2.tar.gz
gnunet-65e91346db9fe4ca1b1ff6516872454c468eb7f2.zip
14 files changed, 31 insertions, 31 deletions
diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c
index 8abb10f90..90ec84bde 100644
--- a/src/namestore/gnunet-namestore-fcfsd.c
+++ b/src/namestore/gnunet-namestore-fcfsd.c
@@ -869,7 +869,7 @@ do_shutdown (void *cls,
  }
  if (NULL != fcfs_zone_pkey)
  {
-    GNUNET_CRYPTO_ecc_key_free (fcfs_zone_pkey);
+    GNUNET_free (fcfs_zone_pkey);
    fcfs_zone_pkey = NULL;
  }
 }
diff --git a/src/namestore/test_namestore_api.c b/src/namestore/test_namestore_api.c
index ede81eee4..ac5cb5a9b 100644
--- a/src/namestore/test_namestore_api.c
+++ b/src/namestore/test_namestore_api.c
@@ -58,7 +58,7 @@ cleanup ()
  }
  if (NULL != privkey)
  {
-    GNUNET_CRYPTO_ecc_key_free (privkey);
+    GNUNET_free (privkey);
    privkey = NULL;
  }
  GNUNET_SCHEDULER_shutdown ();
diff --git a/src/namestore/test_namestore_api_create.c b/src/namestore/test_namestore_api_create.c
index 667bf0827..cf9ad7de7 100644
--- a/src/namestore/test_namestore_api_create.c
+++ b/src/namestore/test_namestore_api_create.c
@@ -78,7 +78,7 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
    GNUNET_NAMESTORE_disconnect (nsh);
  nsh = NULL;
  if (privkey != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey);
+    GNUNET_free (privkey);
  privkey = NULL;
  GNUNET_free_non_null (s_name);
  res = 1;
@@ -98,7 +98,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  GNUNET_free_non_null (s_second_record);
  GNUNET_free_non_null (s_name);
  if (privkey != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey);
+    GNUNET_free (privkey);
  privkey = NULL;
  if (nsh != NULL)
    GNUNET_NAMESTORE_disconnect (nsh);
diff --git a/src/namestore/test_namestore_api_create_update.c b/src/namestore/test_namestore_api_create_update.c
index 90d36ccb6..977b2cfcf 100644
--- a/src/namestore/test_namestore_api_create_update.c
+++ b/src/namestore/test_namestore_api_create_update.c
@@ -81,7 +81,7 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
    GNUNET_NAMESTORE_disconnect (nsh);
  nsh = NULL;
  if (privkey != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey);
+    GNUNET_free (privkey);
  privkey = NULL;
  GNUNET_free_non_null (s_name);
  res = 1;
@@ -100,7 +100,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  GNUNET_free (s_first_record);
  GNUNET_free_non_null (s_second_record);
  if (privkey != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey);
+    GNUNET_free (privkey);
  privkey = NULL;
  if (nsh != NULL)
    GNUNET_NAMESTORE_disconnect (nsh);
diff --git a/src/namestore/test_namestore_api_lookup.c b/src/namestore/test_namestore_api_lookup.c
index 24ef4c74e..71ca02859 100644
--- a/src/namestore/test_namestore_api_lookup.c
+++ b/src/namestore/test_namestore_api_lookup.c
@@ -70,7 +70,7 @@ cleanup ()
  }
  if (NULL != privkey)
  {
-    GNUNET_CRYPTO_ecc_key_free (privkey);
+    GNUNET_free (privkey);
    privkey = NULL;
  }
  GNUNET_SCHEDULER_shutdown ();
diff --git a/src/namestore/test_namestore_api_lookup_specific_type.c b/src/namestore/test_namestore_api_lookup_specific_type.c
index 1d084dbc1..03eee2b02 100644
--- a/src/namestore/test_namestore_api_lookup_specific_type.c
+++ b/src/namestore/test_namestore_api_lookup_specific_type.c
@@ -76,7 +76,7 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
    GNUNET_NAMESTORE_disconnect (nsh);
  nsh = NULL;
  if (privkey != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey);
+    GNUNET_free (privkey);
  privkey = NULL;
  GNUNET_free_non_null (s_name);
  res = 1;
@@ -100,7 +100,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  GNUNET_free (s_rd);
  GNUNET_free_non_null (s_name);
  if (privkey != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey);
+    GNUNET_free (privkey);
  privkey = NULL;
  if (nsh != NULL)
    GNUNET_NAMESTORE_disconnect (nsh);
diff --git a/src/namestore/test_namestore_api_monitoring.c b/src/namestore/test_namestore_api_monitoring.c
index f60116a79..3f1224151 100644
--- a/src/namestore/test_namestore_api_monitoring.c
+++ b/src/namestore/test_namestore_api_monitoring.c
@@ -117,12 +117,12 @@ do_shutdown ()
  if (NULL != privkey)
  {
-    GNUNET_CRYPTO_ecc_key_free (privkey);
+    GNUNET_free (privkey);
    privkey = NULL;
  }
  if (NULL != privkey2)
  {
-    GNUNET_CRYPTO_ecc_key_free (privkey2);
+    GNUNET_free (privkey2);
    privkey2 = NULL;
  }
 }
diff --git a/src/namestore/test_namestore_api_put.c b/src/namestore/test_namestore_api_put.c
index ccbe8eefe..f5adc7d85 100644
--- a/src/namestore/test_namestore_api_put.c
+++ b/src/namestore/test_namestore_api_put.c
@@ -66,7 +66,7 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  if (privkey != NULL)
  {
-    GNUNET_CRYPTO_ecc_key_free (privkey);
+    GNUNET_free (privkey);
    privkey = NULL;
  }
  GNUNET_SCHEDULER_shutdown ();
@@ -85,7 +85,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  if (privkey != NULL)
  {
-    GNUNET_CRYPTO_ecc_key_free (privkey);
+    GNUNET_free (privkey);
    privkey = NULL;
  }
  if (nsh != NULL)
diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c
index 19721f5a1..e666eac0e 100644
--- a/src/namestore/test_namestore_api_remove.c
+++ b/src/namestore/test_namestore_api_remove.c
@@ -77,7 +77,7 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
    GNUNET_NAMESTORE_disconnect (nsh);
  nsh = NULL;
  if (privkey != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey);
+    GNUNET_free (privkey);
  privkey = NULL;
  GNUNET_free_non_null (s_name);
  res = 1;
@@ -98,7 +98,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
    GNUNET_free_non_null((void *) s_rd[c].data);
  GNUNET_free (s_rd);
  if (privkey != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey);
+    GNUNET_free (privkey);
  privkey = NULL;
  if (nsh != NULL)
    GNUNET_NAMESTORE_disconnect (nsh);
diff --git a/src/namestore/test_namestore_api_remove_not_existing_record.c b/src/namestore/test_namestore_api_remove_not_existing_record.c
index 6247ff346..9e0b22ea5 100644
--- a/src/namestore/test_namestore_api_remove_not_existing_record.c
+++ b/src/namestore/test_namestore_api_remove_not_existing_record.c
@@ -77,7 +77,7 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
    GNUNET_NAMESTORE_disconnect (nsh);
  nsh = NULL;
  if (privkey != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey);
+    GNUNET_free (privkey);
  privkey = NULL;
  GNUNET_free_non_null (s_name);
  res = 1;
@@ -99,7 +99,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  GNUNET_free (s_rd);
  if (privkey != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey);
+    GNUNET_free (privkey);
  privkey = NULL;
  if (nsh != NULL)
    GNUNET_NAMESTORE_disconnect (nsh);
diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c
index 036944e9a..94515510a 100644
--- a/src/namestore/test_namestore_api_zone_iteration.c
+++ b/src/namestore/test_namestore_api_zone_iteration.c
@@ -117,11 +117,11 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  }
  if (privkey != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey);
+    GNUNET_free (privkey);
  privkey = NULL;
  if (privkey2 != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey2);
+    GNUNET_free (privkey2);
  privkey2 = NULL;
  res = 1;
 }
@@ -143,11 +143,11 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  }
  if (privkey != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey);
+    GNUNET_free (privkey);
  privkey = NULL;
  if (privkey2 != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey2);
+    GNUNET_free (privkey2);
  privkey2 = NULL;
  GNUNET_free (sig_1);
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 d0db013b7..453f09bb1 100644
--- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
+++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
@@ -115,11 +115,11 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  }
  if (privkey != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey);
+    GNUNET_free (privkey);
  privkey = NULL;
  if (privkey2 != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey2);
+    GNUNET_free (privkey2);
  privkey2 = NULL;
  res = 1;
 }
@@ -139,10 +139,10 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
    endbadly_task = GNUNET_SCHEDULER_NO_TASK;
  }
  if (privkey != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey);
+    GNUNET_free (privkey);
  privkey = NULL;
  if (privkey2 != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey2);
+    GNUNET_free (privkey2);
  privkey2 = NULL;
  GNUNET_free (sig_1);
diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c
index abd7c2564..f4face314 100644
--- a/src/namestore/test_namestore_api_zone_iteration_stop.c
+++ b/src/namestore/test_namestore_api_zone_iteration_stop.c
@@ -112,11 +112,11 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
    GNUNET_free (s_rd_3);
  }
  if (privkey != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey);
+    GNUNET_free (privkey);
  privkey = NULL;
  if (privkey2 != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey2);
+    GNUNET_free (privkey2);
  privkey2 = NULL;
  res = 1;
 }
@@ -137,10 +137,10 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
    endbadly_task = GNUNET_SCHEDULER_NO_TASK;
  }
  if (privkey != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey);
+    GNUNET_free (privkey);
  privkey = NULL;
  if (privkey2 != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey2);
+    GNUNET_free (privkey2);
  privkey2 = NULL;
  GNUNET_free (sig_1);
diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c
index ea242c49e..5e6cf5a4e 100644
--- a/src/namestore/test_namestore_api_zone_to_name.c
+++ b/src/namestore/test_namestore_api_zone_to_name.c
@@ -73,7 +73,7 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
    GNUNET_NAMESTORE_disconnect (nsh);
  nsh = NULL;
  if (privkey != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey);
+    GNUNET_free (privkey);
  privkey = NULL;
  res = 1;
 }
@@ -88,7 +88,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
    endbadly_task = GNUNET_SCHEDULER_NO_TASK;
  }
  if (privkey != NULL)
-    GNUNET_CRYPTO_ecc_key_free (privkey);
+    GNUNET_free (privkey);
  privkey = NULL;
  if (nsh != NULL)
    GNUNET_NAMESTORE_disconnect (nsh);
author	Christian Grothoff <christian@grothoff.org>	2013-08-21 15:34:18 +0000
committer	Christian Grothoff <christian@grothoff.org>	2013-08-21 15:34:18 +0000
commit	65e91346db9fe4ca1b1ff6516872454c468eb7f2 (patch)
tree	4228cfb2c3b628f6dd011f8b73075ecb86343217 /src/namestore
parent	47386fdbe2b5945fc2c319ef6899e3b67157d04f (diff)
download	gnunet-65e91346db9fe4ca1b1ff6516872454c468eb7f2.tar.gz gnunet-65e91346db9fe4ca1b1ff6516872454c468eb7f2.zip

diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c index 8abb10f90..90ec84bde 100644 --- a/src/namestore/gnunet-namestore-fcfsd.c +++ b/src/namestore/gnunet-namestore-fcfsd.c
@@ -869,7 +869,7 @@ do_shutdown (void *cls,
869	}	869	}
870	if (NULL != fcfs_zone_pkey)	870	if (NULL != fcfs_zone_pkey)
871	{	871	{
872	GNUNET_CRYPTO_ecc_key_free (fcfs_zone_pkey);	872	GNUNET_free (fcfs_zone_pkey);
873	fcfs_zone_pkey = NULL;	873	fcfs_zone_pkey = NULL;
874	}	874	}
875	}	875	}


diff --git a/src/namestore/test_namestore_api.c b/src/namestore/test_namestore_api.c index ede81eee4..ac5cb5a9b 100644 --- a/src/namestore/test_namestore_api.c +++ b/src/namestore/test_namestore_api.c
@@ -58,7 +58,7 @@ cleanup ()
58	}	58	}
59	if (NULL != privkey)	59	if (NULL != privkey)
60	{	60	{
61	GNUNET_CRYPTO_ecc_key_free (privkey);	61	GNUNET_free (privkey);
62	privkey = NULL;	62	privkey = NULL;
63	}	63	}
64	GNUNET_SCHEDULER_shutdown ();	64	GNUNET_SCHEDULER_shutdown ();


diff --git a/src/namestore/test_namestore_api_create.c b/src/namestore/test_namestore_api_create.c index 667bf0827..cf9ad7de7 100644 --- a/src/namestore/test_namestore_api_create.c +++ b/src/namestore/test_namestore_api_create.c
@@ -78,7 +78,7 @@ endbadly (void cls, const struct GNUNET_SCHEDULER_TaskContext tc)
78	GNUNET_NAMESTORE_disconnect (nsh);	78	GNUNET_NAMESTORE_disconnect (nsh);
79	nsh = NULL;	79	nsh = NULL;
80	if (privkey != NULL)	80	if (privkey != NULL)
81	GNUNET_CRYPTO_ecc_key_free (privkey);	81	GNUNET_free (privkey);
82	privkey = NULL;	82	privkey = NULL;
83	GNUNET_free_non_null (s_name);	83	GNUNET_free_non_null (s_name);
84	res = 1;	84	res = 1;
@@ -98,7 +98,7 @@ end (void cls, const struct GNUNET_SCHEDULER_TaskContext tc)
98	GNUNET_free_non_null (s_second_record);	98	GNUNET_free_non_null (s_second_record);
99	GNUNET_free_non_null (s_name);	99	GNUNET_free_non_null (s_name);
100	if (privkey != NULL)	100	if (privkey != NULL)
101	GNUNET_CRYPTO_ecc_key_free (privkey);	101	GNUNET_free (privkey);
102	privkey = NULL;	102	privkey = NULL;
103	if (nsh != NULL)	103	if (nsh != NULL)
104	GNUNET_NAMESTORE_disconnect (nsh);	104	GNUNET_NAMESTORE_disconnect (nsh);


diff --git a/src/namestore/test_namestore_api_create_update.c b/src/namestore/test_namestore_api_create_update.c index 90d36ccb6..977b2cfcf 100644 --- a/src/namestore/test_namestore_api_create_update.c +++ b/src/namestore/test_namestore_api_create_update.c
@@ -81,7 +81,7 @@ endbadly (void cls, const struct GNUNET_SCHEDULER_TaskContext tc)
81	GNUNET_NAMESTORE_disconnect (nsh);	81	GNUNET_NAMESTORE_disconnect (nsh);
82	nsh = NULL;	82	nsh = NULL;
83	if (privkey != NULL)	83	if (privkey != NULL)
84	GNUNET_CRYPTO_ecc_key_free (privkey);	84	GNUNET_free (privkey);
85	privkey = NULL;	85	privkey = NULL;
86	GNUNET_free_non_null (s_name);	86	GNUNET_free_non_null (s_name);
87	res = 1;	87	res = 1;
@@ -100,7 +100,7 @@ end (void cls, const struct GNUNET_SCHEDULER_TaskContext tc)
100	GNUNET_free (s_first_record);	100	GNUNET_free (s_first_record);
101	GNUNET_free_non_null (s_second_record);	101	GNUNET_free_non_null (s_second_record);
102	if (privkey != NULL)	102	if (privkey != NULL)
103	GNUNET_CRYPTO_ecc_key_free (privkey);	103	GNUNET_free (privkey);
104	privkey = NULL;	104	privkey = NULL;
105	if (nsh != NULL)	105	if (nsh != NULL)
106	GNUNET_NAMESTORE_disconnect (nsh);	106	GNUNET_NAMESTORE_disconnect (nsh);


diff --git a/src/namestore/test_namestore_api_lookup.c b/src/namestore/test_namestore_api_lookup.c index 24ef4c74e..71ca02859 100644 --- a/src/namestore/test_namestore_api_lookup.c +++ b/src/namestore/test_namestore_api_lookup.c
@@ -70,7 +70,7 @@ cleanup ()
70	}	70	}
71	if (NULL != privkey)	71	if (NULL != privkey)
72	{	72	{
73	GNUNET_CRYPTO_ecc_key_free (privkey);	73	GNUNET_free (privkey);
74	privkey = NULL;	74	privkey = NULL;
75	}	75	}
76	GNUNET_SCHEDULER_shutdown ();	76	GNUNET_SCHEDULER_shutdown ();


diff --git a/src/namestore/test_namestore_api_lookup_specific_type.c b/src/namestore/test_namestore_api_lookup_specific_type.c index 1d084dbc1..03eee2b02 100644 --- a/src/namestore/test_namestore_api_lookup_specific_type.c +++ b/src/namestore/test_namestore_api_lookup_specific_type.c
@@ -76,7 +76,7 @@ endbadly (void cls, const struct GNUNET_SCHEDULER_TaskContext tc)
76	GNUNET_NAMESTORE_disconnect (nsh);	76	GNUNET_NAMESTORE_disconnect (nsh);
77	nsh = NULL;	77	nsh = NULL;
78	if (privkey != NULL)	78	if (privkey != NULL)
79	GNUNET_CRYPTO_ecc_key_free (privkey);	79	GNUNET_free (privkey);
80	privkey = NULL;	80	privkey = NULL;
81	GNUNET_free_non_null (s_name);	81	GNUNET_free_non_null (s_name);
82	res = 1;	82	res = 1;
@@ -100,7 +100,7 @@ end (void cls, const struct GNUNET_SCHEDULER_TaskContext tc)
100	GNUNET_free (s_rd);	100	GNUNET_free (s_rd);
101	GNUNET_free_non_null (s_name);	101	GNUNET_free_non_null (s_name);
102	if (privkey != NULL)	102	if (privkey != NULL)
103	GNUNET_CRYPTO_ecc_key_free (privkey);	103	GNUNET_free (privkey);
104	privkey = NULL;	104	privkey = NULL;
105	if (nsh != NULL)	105	if (nsh != NULL)
106	GNUNET_NAMESTORE_disconnect (nsh);	106	GNUNET_NAMESTORE_disconnect (nsh);


diff --git a/src/namestore/test_namestore_api_monitoring.c b/src/namestore/test_namestore_api_monitoring.c index f60116a79..3f1224151 100644 --- a/src/namestore/test_namestore_api_monitoring.c +++ b/src/namestore/test_namestore_api_monitoring.c
@@ -117,12 +117,12 @@ do_shutdown ()
117		117
118	if (NULL != privkey)	118	if (NULL != privkey)
119	{	119	{
120	GNUNET_CRYPTO_ecc_key_free (privkey);	120	GNUNET_free (privkey);
121	privkey = NULL;	121	privkey = NULL;
122	}	122	}
123	if (NULL != privkey2)	123	if (NULL != privkey2)
124	{	124	{
125	GNUNET_CRYPTO_ecc_key_free (privkey2);	125	GNUNET_free (privkey2);
126	privkey2 = NULL;	126	privkey2 = NULL;
127	}	127	}
128	}	128	}


diff --git a/src/namestore/test_namestore_api_put.c b/src/namestore/test_namestore_api_put.c index ccbe8eefe..f5adc7d85 100644 --- a/src/namestore/test_namestore_api_put.c +++ b/src/namestore/test_namestore_api_put.c
@@ -66,7 +66,7 @@ endbadly (void cls, const struct GNUNET_SCHEDULER_TaskContext tc)
66		66
67	if (privkey != NULL)	67	if (privkey != NULL)
68	{	68	{
69	GNUNET_CRYPTO_ecc_key_free (privkey);	69	GNUNET_free (privkey);
70	privkey = NULL;	70	privkey = NULL;
71	}	71	}
72	GNUNET_SCHEDULER_shutdown ();	72	GNUNET_SCHEDULER_shutdown ();
@@ -85,7 +85,7 @@ end (void cls, const struct GNUNET_SCHEDULER_TaskContext tc)
85		85
86	if (privkey != NULL)	86	if (privkey != NULL)
87	{	87	{
88	GNUNET_CRYPTO_ecc_key_free (privkey);	88	GNUNET_free (privkey);
89	privkey = NULL;	89	privkey = NULL;
90	}	90	}
91	if (nsh != NULL)	91	if (nsh != NULL)


diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c index 19721f5a1..e666eac0e 100644 --- a/src/namestore/test_namestore_api_remove.c +++ b/src/namestore/test_namestore_api_remove.c
@@ -77,7 +77,7 @@ endbadly (void cls, const struct GNUNET_SCHEDULER_TaskContext tc)
77	GNUNET_NAMESTORE_disconnect (nsh);	77	GNUNET_NAMESTORE_disconnect (nsh);
78	nsh = NULL;	78	nsh = NULL;
79	if (privkey != NULL)	79	if (privkey != NULL)
80	GNUNET_CRYPTO_ecc_key_free (privkey);	80	GNUNET_free (privkey);
81	privkey = NULL;	81	privkey = NULL;
82	GNUNET_free_non_null (s_name);	82	GNUNET_free_non_null (s_name);
83	res = 1;	83	res = 1;
@@ -98,7 +98,7 @@ end (void cls, const struct GNUNET_SCHEDULER_TaskContext tc)
98	GNUNET_free_non_null((void *) s_rd[c].data);	98	GNUNET_free_non_null((void *) s_rd[c].data);
99	GNUNET_free (s_rd);	99	GNUNET_free (s_rd);
100	if (privkey != NULL)	100	if (privkey != NULL)
101	GNUNET_CRYPTO_ecc_key_free (privkey);	101	GNUNET_free (privkey);
102	privkey = NULL;	102	privkey = NULL;
103	if (nsh != NULL)	103	if (nsh != NULL)
104	GNUNET_NAMESTORE_disconnect (nsh);	104	GNUNET_NAMESTORE_disconnect (nsh);


diff --git a/src/namestore/test_namestore_api_remove_not_existing_record.c b/src/namestore/test_namestore_api_remove_not_existing_record.c index 6247ff346..9e0b22ea5 100644 --- a/src/namestore/test_namestore_api_remove_not_existing_record.c +++ b/src/namestore/test_namestore_api_remove_not_existing_record.c
@@ -77,7 +77,7 @@ endbadly (void cls, const struct GNUNET_SCHEDULER_TaskContext tc)
77	GNUNET_NAMESTORE_disconnect (nsh);	77	GNUNET_NAMESTORE_disconnect (nsh);
78	nsh = NULL;	78	nsh = NULL;
79	if (privkey != NULL)	79	if (privkey != NULL)
80	GNUNET_CRYPTO_ecc_key_free (privkey);	80	GNUNET_free (privkey);
81	privkey = NULL;	81	privkey = NULL;
82	GNUNET_free_non_null (s_name);	82	GNUNET_free_non_null (s_name);
83	res = 1;	83	res = 1;
@@ -99,7 +99,7 @@ end (void cls, const struct GNUNET_SCHEDULER_TaskContext tc)
99	GNUNET_free (s_rd);	99	GNUNET_free (s_rd);
100		100
101	if (privkey != NULL)	101	if (privkey != NULL)
102	GNUNET_CRYPTO_ecc_key_free (privkey);	102	GNUNET_free (privkey);
103	privkey = NULL;	103	privkey = NULL;
104	if (nsh != NULL)	104	if (nsh != NULL)
105	GNUNET_NAMESTORE_disconnect (nsh);	105	GNUNET_NAMESTORE_disconnect (nsh);


diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c index 036944e9a..94515510a 100644 --- a/src/namestore/test_namestore_api_zone_iteration.c +++ b/src/namestore/test_namestore_api_zone_iteration.c
@@ -117,11 +117,11 @@ endbadly (void cls, const struct GNUNET_SCHEDULER_TaskContext tc)
117	}	117	}
118		118
119	if (privkey != NULL)	119	if (privkey != NULL)
120	GNUNET_CRYPTO_ecc_key_free (privkey);	120	GNUNET_free (privkey);
121	privkey = NULL;	121	privkey = NULL;
122		122
123	if (privkey2 != NULL)	123	if (privkey2 != NULL)
124	GNUNET_CRYPTO_ecc_key_free (privkey2);	124	GNUNET_free (privkey2);
125	privkey2 = NULL;	125	privkey2 = NULL;
126	res = 1;	126	res = 1;
127	}	127	}
@@ -143,11 +143,11 @@ end (void cls, const struct GNUNET_SCHEDULER_TaskContext tc)
143	}	143	}
144		144
145	if (privkey != NULL)	145	if (privkey != NULL)
146	GNUNET_CRYPTO_ecc_key_free (privkey);	146	GNUNET_free (privkey);
147	privkey = NULL;	147	privkey = NULL;
148		148
149	if (privkey2 != NULL)	149	if (privkey2 != NULL)
150	GNUNET_CRYPTO_ecc_key_free (privkey2);	150	GNUNET_free (privkey2);
151	privkey2 = NULL;	151	privkey2 = NULL;
152		152
153	GNUNET_free (sig_1);	153	GNUNET_free (sig_1);


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 d0db013b7..453f09bb1 100644 --- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c +++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
@@ -115,11 +115,11 @@ endbadly (void cls, const struct GNUNET_SCHEDULER_TaskContext tc)
115	}	115	}
116		116
117	if (privkey != NULL)	117	if (privkey != NULL)
118	GNUNET_CRYPTO_ecc_key_free (privkey);	118	GNUNET_free (privkey);
119	privkey = NULL;	119	privkey = NULL;
120		120
121	if (privkey2 != NULL)	121	if (privkey2 != NULL)
122	GNUNET_CRYPTO_ecc_key_free (privkey2);	122	GNUNET_free (privkey2);
123	privkey2 = NULL;	123	privkey2 = NULL;
124	res = 1;	124	res = 1;
125	}	125	}
@@ -139,10 +139,10 @@ end (void cls, const struct GNUNET_SCHEDULER_TaskContext tc)
139	endbadly_task = GNUNET_SCHEDULER_NO_TASK;	139	endbadly_task = GNUNET_SCHEDULER_NO_TASK;
140	}	140	}
141	if (privkey != NULL)	141	if (privkey != NULL)
142	GNUNET_CRYPTO_ecc_key_free (privkey);	142	GNUNET_free (privkey);
143	privkey = NULL;	143	privkey = NULL;
144	if (privkey2 != NULL)	144	if (privkey2 != NULL)
145	GNUNET_CRYPTO_ecc_key_free (privkey2);	145	GNUNET_free (privkey2);
146	privkey2 = NULL;	146	privkey2 = NULL;
147		147
148	GNUNET_free (sig_1);	148	GNUNET_free (sig_1);


diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c index abd7c2564..f4face314 100644 --- a/src/namestore/test_namestore_api_zone_iteration_stop.c +++ b/src/namestore/test_namestore_api_zone_iteration_stop.c
@@ -112,11 +112,11 @@ endbadly (void cls, const struct GNUNET_SCHEDULER_TaskContext tc)
112	GNUNET_free (s_rd_3);	112	GNUNET_free (s_rd_3);
113	}	113	}
114	if (privkey != NULL)	114	if (privkey != NULL)
115	GNUNET_CRYPTO_ecc_key_free (privkey);	115	GNUNET_free (privkey);
116	privkey = NULL;	116	privkey = NULL;
117		117
118	if (privkey2 != NULL)	118	if (privkey2 != NULL)
119	GNUNET_CRYPTO_ecc_key_free (privkey2);	119	GNUNET_free (privkey2);
120	privkey2 = NULL;	120	privkey2 = NULL;
121	res = 1;	121	res = 1;
122	}	122	}
@@ -137,10 +137,10 @@ end (void cls, const struct GNUNET_SCHEDULER_TaskContext tc)
137	endbadly_task = GNUNET_SCHEDULER_NO_TASK;	137	endbadly_task = GNUNET_SCHEDULER_NO_TASK;
138	}	138	}
139	if (privkey != NULL)	139	if (privkey != NULL)
140	GNUNET_CRYPTO_ecc_key_free (privkey);	140	GNUNET_free (privkey);
141	privkey = NULL;	141	privkey = NULL;
142	if (privkey2 != NULL)	142	if (privkey2 != NULL)
143	GNUNET_CRYPTO_ecc_key_free (privkey2);	143	GNUNET_free (privkey2);
144	privkey2 = NULL;	144	privkey2 = NULL;
145		145
146	GNUNET_free (sig_1);	146	GNUNET_free (sig_1);


diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c index ea242c49e..5e6cf5a4e 100644 --- a/src/namestore/test_namestore_api_zone_to_name.c +++ b/src/namestore/test_namestore_api_zone_to_name.c
@@ -73,7 +73,7 @@ endbadly (void cls, const struct GNUNET_SCHEDULER_TaskContext tc)
73	GNUNET_NAMESTORE_disconnect (nsh);	73	GNUNET_NAMESTORE_disconnect (nsh);
74	nsh = NULL;	74	nsh = NULL;
75	if (privkey != NULL)	75	if (privkey != NULL)
76	GNUNET_CRYPTO_ecc_key_free (privkey);	76	GNUNET_free (privkey);
77	privkey = NULL;	77	privkey = NULL;
78	res = 1;	78	res = 1;
79	}	79	}
@@ -88,7 +88,7 @@ end (void cls, const struct GNUNET_SCHEDULER_TaskContext tc)
88	endbadly_task = GNUNET_SCHEDULER_NO_TASK;	88	endbadly_task = GNUNET_SCHEDULER_NO_TASK;
89	}	89	}
90	if (privkey != NULL)	90	if (privkey != NULL)
91	GNUNET_CRYPTO_ecc_key_free (privkey);	91	GNUNET_free (privkey);
92	privkey = NULL;	92	privkey = NULL;
93	if (nsh != NULL)	93	if (nsh != NULL)
94	GNUNET_NAMESTORE_disconnect (nsh);	94	GNUNET_NAMESTORE_disconnect (nsh);