GNUNET_free_non_null -> GNUNET_free

2 files changed, 9 insertions, 9 deletions

diff --git a/src/pq/pq_connect.c b/src/pq/pq_connect.c
index 8da273b2b..405dca174 100644
--- a/src/pq/pq_connect.c
+++ b/src/pq/pq_connect.c
@@ -125,7 +125,7 @@ GNUNET_PQ_connect (const char *config_str,
   GNUNET_PQ_reconnect (db);
   if (NULL == db->conn)
   {
-    GNUNET_free_non_null (db->load_path);
+    GNUNET_free (db->load_path);
     GNUNET_free (db->config_str);
     GNUNET_free (db);
     return NULL;
@@ -495,9 +495,9 @@ GNUNET_PQ_connect_with_cfg (const struct GNUNET_CONFIGURATION_Handle *cfg,
                           load_path,
                           es,
                           ps);
-  GNUNET_free_non_null (load_path);
-  GNUNET_free_non_null (sp);
-  GNUNET_free_non_null (conninfo);
+  GNUNET_free (load_path);
+  GNUNET_free (sp);
+  GNUNET_free (conninfo);
   return db;
 }
 
@@ -511,10 +511,10 @@ GNUNET_PQ_connect_with_cfg (const struct GNUNET_CONFIGURATION_Handle *cfg,
 void
 GNUNET_PQ_disconnect (struct GNUNET_PQ_Context *db)
 {
-  GNUNET_free_non_null (db->es);
-  GNUNET_free_non_null (db->ps);
-  GNUNET_free_non_null (db->load_path);
-  GNUNET_free_non_null (db->config_str);
+  GNUNET_free (db->es);
+  GNUNET_free (db->ps);
+  GNUNET_free (db->load_path);
+  GNUNET_free (db->config_str);
   PQfinish (db->conn);
   GNUNET_free (db);
 }
diff --git a/src/pq/pq_prepare.c b/src/pq/pq_prepare.c
index b7003fb69..63087456f 100644
--- a/src/pq/pq_prepare.c
+++ b/src/pq/pq_prepare.c
@@ -83,7 +83,7 @@ GNUNET_PQ_prepare_statements (struct GNUNET_PQ_Context *db,
     memcpy (&rps[olen],
             ps,
             nlen * sizeof (struct GNUNET_PQ_PreparedStatement));
-    GNUNET_free_non_null (db->ps);
+    GNUNET_free (db->ps);
     db->ps = rps;
   }