From f530fd6ab2ab7743f975d8d1abbdeeb012e06079 Mon Sep 17 00:00:00 2001
From: LRN <lrn1986@gmail.com>
Date: Sat, 24 Jan 2015 23:01:29 +0000
Subject: [PATCH] Fix the use of (GNUNET_)strdup and (GNUNET_)free

---
 src/gns/gnunet-dns2gns.c              | 2 +-
 src/testbed/testbed_api_hosts.c       | 2 +-
 src/testing/testing.c                 | 8 ++++----
 src/transport/test_plugin_transport.c | 2 +-
 src/util/helper.c                     | 2 +-
 src/util/test_plugin.c                | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c
index 0e347ca7e..35f0a016d 100644
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -357,7 +357,7 @@ result_processor (void *cls,
 	  break;
 	case GNUNET_DNSPARSER_TYPE_CNAME:
 	  rec.name = GNUNET_strdup (packet->queries[0].name);
-	  rec.data.hostname = strdup (rd[i].data);
+	  rec.data.hostname = GNUNET_strdup (rd[i].data);
 	  rec.dns_traffic_class = GNUNET_TUN_DNS_CLASS_INTERNET;
 	  rec.type = GNUNET_DNSPARSER_TYPE_CNAME;
 	  memcpy (rec.data.hostname,
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index 292dafadf..d64a9554f 100644
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -765,7 +765,7 @@ copy_argv (const char *const *argv)
   for (argp = 0; NULL != argv[argp]; argp++) ;
   argv_dup = GNUNET_malloc (sizeof (char *) * (argp + 1));
   for (argp = 0; NULL != argv[argp]; argp++)
-    argv_dup[argp] = strdup (argv[argp]);
+    argv_dup[argp] = GNUNET_strdup (argv[argp]);
   return argv_dup;
 }
 
diff --git a/src/testing/testing.c b/src/testing/testing.c
index a4fdd38ca..88ee86a4c 100644
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -1253,11 +1253,11 @@ GNUNET_TESTING_peer_configure (struct GNUNET_TESTING_System *system,
   {
     /* No prefix */
     GNUNET_asprintf(&peer->main_binary, "%s", libexec_binary);
-    peer->args = strdup ("");
+    peer->args = GNUNET_strdup ("");
   }
   else
   {
-    peer->args = strdup (libexec_binary);
+    peer->args = GNUNET_strdup (libexec_binary);
   }
   peer->system = system;
   peer->key_number = key_number;
@@ -1724,10 +1724,10 @@ GNUNET_TESTING_service_run (const char *testdir,
   {
     /* No prefix */
     GNUNET_asprintf(&peer->main_binary, "%s", libexec_binary);
-    peer->args = strdup ("");
+    peer->args = GNUNET_strdup ("");
   }
   else
-    peer->args = strdup (libexec_binary);
+    peer->args = GNUNET_strdup (libexec_binary);
 
   GNUNET_free (libexec_binary);
   GNUNET_free (binary);
diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c
index 2185478e7..e2d178ad0 100644
--- a/src/transport/test_plugin_transport.c
+++ b/src/transport/test_plugin_transport.c
@@ -348,7 +348,7 @@ env_notify_address (void *cls,
     GNUNET_CONTAINER_DLL_insert(head, tail, w);
     got_reply = GNUNET_NO;
     GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Testing: address_to_string \n");
-    w->addrstring = strdup (
+    w->addrstring = GNUNET_strdup (
         api->address_to_string (api, w->address->address,
             w->address->address_length));
     if (NULL == w->addrstring)
diff --git a/src/util/helper.c b/src/util/helper.c
index 6dd417a91..3ff72c329 100644
--- a/src/util/helper.c
+++ b/src/util/helper.c
@@ -498,7 +498,7 @@ GNUNET_HELPER_start (int with_control_pipe,
   if (NULL != strstr (binary_name, "gnunet"))
     h->binary_name = GNUNET_OS_get_libexec_binary_path (binary_name);
   else
-    h->binary_name = strdup (binary_name);
+    h->binary_name = GNUNET_strdup (binary_name);
   for (c = 0; NULL != binary_argv[c]; c++);
   h->binary_argv = GNUNET_malloc (sizeof (char *) * (c + 1));
   for (c = 0; NULL != binary_argv[c]; c++)
diff --git a/src/util/test_plugin.c b/src/util/test_plugin.c
index 135447da8..02aa6c038 100644
--- a/src/util/test_plugin.c
+++ b/src/util/test_plugin.c
@@ -35,7 +35,7 @@ test_cb (void *cls, const char *libname, void *lib_ret)
   ret = GNUNET_PLUGIN_unload (libname, "out");
   GNUNET_assert (NULL != ret);
   GNUNET_assert (0 == strcmp (ret, "World"));
-  GNUNET_free (ret);
+  free (ret);
 }
 
 
-- 
2.25.1