GNUNET_free_non_null -> GNUNET_free

5 files changed, 24 insertions, 24 deletions

diff --git a/src/regex/gnunet-regex-profiler.c b/src/regex/gnunet-regex-profiler.c
index 3f8133d61..e82e10e3b 100644
--- a/src/regex/gnunet-regex-profiler.c
+++ b/src/regex/gnunet-regex-profiler.c
@@ -448,9 +448,9 @@ do_shutdown (void *cls)
        search_str_cnt < num_peers && NULL != search_strings;
        search_str_cnt++)
   {
-    GNUNET_free_non_null (search_strings[search_str_cnt]);
+    GNUNET_free (search_strings[search_str_cnt]);
   }
-  GNUNET_free_non_null (search_strings);
+  GNUNET_free (search_strings);
   search_strings = NULL;
 
   if (NULL != reg_handle)
diff --git a/src/regex/gnunet-regex-simulation-profiler.c b/src/regex/gnunet-regex-simulation-profiler.c
index 9adde99bd..3d449a04e 100644
--- a/src/regex/gnunet-regex-simulation-profiler.c
+++ b/src/regex/gnunet-regex-simulation-profiler.c
@@ -255,7 +255,7 @@ reset_meter (struct ProgressMeter *meter)
 static void
 free_meter (struct ProgressMeter *meter)
 {
-  GNUNET_free_non_null (meter->startup_string);
+  GNUNET_free (meter->startup_string);
   GNUNET_free (meter);
 }
 
diff --git a/src/regex/regex_internal.c b/src/regex/regex_internal.c
index 1dd4f6a97..cd33281e2 100644
--- a/src/regex/regex_internal.c
+++ b/src/regex/regex_internal.c
@@ -168,7 +168,7 @@ state_remove_transition (struct REGEX_INTERNAL_State *state,
   if (transition->from_state != state)
     return;
 
-  GNUNET_free_non_null (transition->label);
+  GNUNET_free (transition->label);
 
   state->transition_count--;
   GNUNET_CONTAINER_DLL_remove (state->transitions_head,
@@ -310,8 +310,8 @@ automaton_destroy_state (struct REGEX_INTERNAL_State *s)
   if (NULL == s)
     return;
 
-  GNUNET_free_non_null (s->name);
-  GNUNET_free_non_null (s->proof);
+  GNUNET_free (s->name);
+  GNUNET_free (s->proof);
   state_set_clear (&s->nfa_set);
   for (t = s->transitions_head; NULL != t; t = next_t)
   {
@@ -658,7 +658,7 @@ sb_realloc (struct StringBuffer *ret, size_t nlen)
   ret->blen = nlen;
   GNUNET_memcpy (ret->abuf, ret->sbuf, ret->slen);
   ret->sbuf = ret->abuf;
-  GNUNET_free_non_null (old);
+  GNUNET_free (old);
 }
 
 
@@ -726,7 +726,7 @@ sb_wrap (struct StringBuffer *ret, const char *format, size_t extra_chars)
                    format,
                    (int) ret->slen,
                    ret->sbuf);
-  GNUNET_free_non_null (ret->abuf);
+  GNUNET_free (ret->abuf);
   ret->abuf = temp;
   ret->sbuf = temp;
   ret->blen = ret->slen + extra_chars + 1;
@@ -1592,8 +1592,8 @@ automaton_create_proofs (struct REGEX_INTERNAL_Automaton *a)
   if ((NULL == R_last) || (NULL == R_cur))
   {
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "malloc");
-    GNUNET_free_non_null (R_cur);
-    GNUNET_free_non_null (R_last);
+    GNUNET_free (R_cur);
+    GNUNET_free (R_last);
     return GNUNET_SYSERR;
   }
 
@@ -2159,7 +2159,7 @@ dfa_add_multi_strides_helper (void *cls,
                                     t->to_state);
     }
   }
-  GNUNET_free_non_null (label);
+  GNUNET_free (label);
 }
 
 
@@ -2213,7 +2213,7 @@ REGEX_INTERNAL_dfa_add_multi_strides (struct REGEX_INTERNAL_Context *regex_ctx,
     t_next = t->next;
     state_add_transition (regex_ctx, t->from_state, t->label, t->to_state);
     GNUNET_CONTAINER_DLL_remove (ctx.transitions_head, ctx.transitions_tail, t);
-    GNUNET_free_non_null (t->label);
+    GNUNET_free (t->label);
     GNUNET_free (t);
   }
 
@@ -2361,7 +2361,7 @@ dfa_compress_paths (struct REGEX_INTERNAL_Context *regex_ctx,
     t_next = t->next;
     state_add_transition (regex_ctx, t->from_state, t->label, t->to_state);
     GNUNET_CONTAINER_DLL_remove (transitions_head, transitions_tail, t);
-    GNUNET_free_non_null (t->label);
+    GNUNET_free (t->label);
     GNUNET_free (t);
   }
 
@@ -2972,7 +2972,7 @@ error:
   if (NULL != error_msg)
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s\n", error_msg);
 
-  GNUNET_free_non_null (p);
+  GNUNET_free (p);
 
   while (NULL != (nfa = ctx.stack_head))
   {
@@ -3133,8 +3133,8 @@ REGEX_INTERNAL_automaton_destroy (struct REGEX_INTERNAL_Automaton *a)
   if (NULL == a)
     return;
 
-  GNUNET_free_non_null (a->regex);
-  GNUNET_free_non_null (a->canonical_regex);
+  GNUNET_free (a->regex);
+  GNUNET_free (a->canonical_regex);
 
   for (s = a->states_head; NULL != s; s = next_state)
   {
diff --git a/src/regex/regex_test_lib.c b/src/regex/regex_test_lib.c
index 05001b5d2..58cd8dc10 100644
--- a/src/regex/regex_test_lib.c
+++ b/src/regex/regex_test_lib.c
@@ -222,10 +222,10 @@ regex_combine (struct RegexCombineCtx *ctx)
     else
     {
       GNUNET_asprintf (&tmp, "%s%s|", regex, s);
-      GNUNET_free_non_null (regex);
+      GNUNET_free (regex);
       regex = tmp;
     }
-    GNUNET_free_non_null (s);
+    GNUNET_free (s);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "  so far '%s' for inner %s\n", regex,
                 ctx->s);
   }
@@ -517,7 +517,7 @@ regex_ctx_destroy (struct RegexCombineCtx *ctx)
   {
     regex_ctx_destroy (ctx->children[i]);
   }
-  GNUNET_free_non_null (ctx->s);  /* 's' on root node is null */
+  GNUNET_free (ctx->s);  /* 's' on root node is null */
   GNUNET_free (ctx->children);
   GNUNET_free (ctx);
 }
@@ -632,7 +632,7 @@ REGEX_TEST_read_from_file (const char *filename)
     regex = NULL;
   }
   while (offset < size);
-  GNUNET_free_non_null (regex);
+  GNUNET_free (regex);
   GNUNET_free (buffer);
 
   return regexes;
diff --git a/src/regex/test_regex_eval_api.c b/src/regex/test_regex_eval_api.c
index 767571156..7cd081269 100644
--- a/src/regex/test_regex_eval_api.c
+++ b/src/regex/test_regex_eval_api.c
@@ -178,9 +178,9 @@ test_random (unsigned int rx_length, unsigned int max_str_len,
   return result;
 
 error:
-  GNUNET_free_non_null (matching_str);
-  GNUNET_free_non_null (rand_rx);
-  GNUNET_free_non_null (canonical_regex);
+  GNUNET_free (matching_str);
+  GNUNET_free (rand_rx);
+  GNUNET_free (canonical_regex);
   return -1;
 }
 
@@ -371,7 +371,7 @@ main (int argc, char *argv[])
     REGEX_INTERNAL_automaton_destroy (a);
     if (0 != check_dfa)
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "check_proof: %s\n", check_proof);
-    GNUNET_free_non_null (check_proof);
+    GNUNET_free (check_proof);
 
     regfree (&rx);
   }