1 files changed, 26 insertions, 13 deletions

diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index faf02567..47f55a0b 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -1031,9 +1031,12 @@ void on_namespaceUpdateButton_clicked_fs(GtkWidget * dummy1,
     GE_BREAK(ectx, 0);
     UNREF(metaXML);
     metaXML = NULL;
-    FREENONNULL(last);
-    FREENONNULL(next);
-    FREENONNULL(freq);
+    if (last != NULL)
+      free(last);
+    if (next != NULL)
+      free(next);
+    if (freq != NULL)
+      free(freq);
     return;
   }
   if (OK == enc2hash(last,
@@ -1066,9 +1069,12 @@ void on_namespaceUpdateButton_clicked_fs(GtkWidget * dummy1,
       GE_BREAK(ectx, 0);
       UNREF(metaXML);
       metaXML = NULL;
-      FREENONNULL(last);
-      FREENONNULL(next);
-      FREENONNULL(freq);
+      if (last != NULL)
+        free(last);
+      if (next != NULL)
+        free(next);
+      if (freq != NULL)
+        free(freq);
       return;
     }
     hash2enc(&nextId,
@@ -1148,9 +1154,12 @@ void on_namespaceUpdateButton_clicked_fs(GtkWidget * dummy1,
   gtk_widget_destroy(dialog);
   UNREF(metaXML);
   metaXML = NULL;
-  FREENONNULL(last);
-  FREENONNULL(next);
-  FREENONNULL(freq);
+  if (last != NULL)
+    free(last);
+  if (next != NULL)
+    free(next);
+  if (freq != NULL)
+    free(freq);
   DEBUG_END();
 }
 
@@ -1248,8 +1257,10 @@ void on_namespaceRatingSpinButton_changed_fs(GtkWidget * dummy,
     gtk_widget_set_sensitive(spin,
                              FALSE);
   }
-  FREENONNULL(description);
-  FREENONNULL(encStr);
+  if (description != NULL)
+    free(description);
+  if (encStr != NULL)
+    free(encStr);
   DEBUG_END();
 }
 
@@ -1324,8 +1335,10 @@ void on_searchNamespaceComboBoxEntry_changed_fs(GtkWidget * dummy,
     gtk_widget_set_sensitive(spin,
                              FALSE);
   }
-  FREENONNULL(descStr);
-  FREENONNULL(encStr);
+  if (descStr != NULL)
+    free(descStr);
+  if (encStr != NULL)
+    free(encStr);
   DEBUG_END();
 }