[Openvas-commits] r7910 - in trunk/openvas-libraries: . base

[scm-commit@wald.intevation.org]

Author: felix
Date: 2010-06-03 11:54:49 +0200 (Thu, 03 Jun 2010)
New Revision: 7910

Modified:
   trunk/openvas-libraries/ChangeLog
   trunk/openvas-libraries/base/openvas_string.c
   trunk/openvas-libraries/base/openvas_string.h
Log:
* base/openvas_string.c (openvas_string_flatten_string_list): Do not
terminate with given separator.
(openvas_string_list_free): New. Convenience function to free a list of
gchar*s.

* base/openvas_string.h (openvas_string_list_free): Added proto.


Modified: trunk/openvas-libraries/ChangeLog
===================================================================
--- trunk/openvas-libraries/ChangeLog	2010-06-03 09:35:50 UTC (rev 7909)
+++ trunk/openvas-libraries/ChangeLog	2010-06-03 09:54:49 UTC (rev 7910)
@@ -1,5 +1,14 @@
 2010-06-03  Felix Wolfsteller <felix.wolfsteller at greenbone.net>
 
+	* base/openvas_string.c (openvas_string_flatten_string_list): Do not
+	terminate with given separator.
+	(openvas_string_list_free): New. Convenience function to free a list of
+	gchar*s.
+
+	* base/openvas_string.h (openvas_string_list_free): Added proto.
+
+2010-06-03  Felix Wolfsteller <felix.wolfsteller at greenbone.net>
+
 	* base/openvas_string.c (openvas_string_flatten_string_list): Donate
 	own memory to returned variable.
 

Modified: trunk/openvas-libraries/base/openvas_string.c
===================================================================
--- trunk/openvas-libraries/base/openvas_string.c	2010-06-03 09:35:50 UTC (rev 7909)
+++ trunk/openvas-libraries/base/openvas_string.c	2010-06-03 09:54:49 UTC (rev 7910)
@@ -252,9 +252,26 @@
   while (it)
     {
       openvas_append_string (&result, it->data);
-      if (separator)
+      if (separator && g_slist_next (it) != NULL)
         openvas_append_string (&result, separator);
       it = g_slist_next (it);
     }
   return result;
 }
+
+/**
+ * @brief Frees content of list and list with g_(slist_)free.
+ *
+ * @param[in] string_list GSList to free.
+ */
+void
+openvas_string_list_free (GSList* string_list)
+{
+  GSList* it = string_list;
+  while (it)
+    {
+      g_free (it->data);
+      it = g_slist_next (it);
+    }
+  g_slist_free (string_list);
+}

Modified: trunk/openvas-libraries/base/openvas_string.h
===================================================================
--- trunk/openvas-libraries/base/openvas_string.h	2010-06-03 09:35:50 UTC (rev 7909)
+++ trunk/openvas-libraries/base/openvas_string.h	2010-06-03 09:54:49 UTC (rev 7910)
@@ -46,4 +46,6 @@
 gchar* openvas_string_flatten_string_list (GSList* string_list,
                                            const gchar* separator);
 
+void openvas_string_list_free (GSList* string_list);
+
 #endif /* not _OPENVAS_LIBRARIES_STRING_H */