all: fix warning about unused return value in g_string_free (.., FALSE)

Author: EmmanuelP

src/arvdebug.c

@@ -264,7 +264,6 @@ arv_debug_dup_infos_as_string (void)
 	GEnumClass *debug_level_class = g_type_class_ref (ARV_TYPE_DEBUG_LEVEL);
 	GString *string = g_string_new ("");
 	unsigned int i;
-	char *str;
 
 	g_string_append (string, "Debug categories:\n");
 	for (i = 0; i < ARV_DEBUG_CATEGORY_N_ELEMENTS; i++) {
@@ -285,10 +284,7 @@ arv_debug_dup_infos_as_string (void)
 
 	g_type_class_unref (debug_level_class);
 
-	str = string->str;
-	g_string_free (string, FALSE);
-
-	return str;
+        return arv_g_string_free_and_steal(string);
 }
 
 void

src/arvgcpropertynode.c

@@ -36,7 +36,7 @@
 #include <arvgcstring.h>
 #include <arvgc.h>
 #include <arvdomtext.h>
-#include <arvmisc.h>
+#include <arvmiscprivate.h>
 #include <arvdebugprivate.h>
 #include <arvenumtypes.h>
 #include <string.h>
@@ -242,8 +242,7 @@ _get_value_data (ArvGcPropertyNode *property_node)
 		     iter = arv_dom_node_get_next_sibling (iter))
 			g_string_append (string, arv_dom_character_data_get_data (ARV_DOM_CHARACTER_DATA (iter)));
 		g_free (priv->value_data);
-		priv->value_data = string->str;
-		g_string_free (string, FALSE);
+		priv->value_data = arv_g_string_free_and_steal(string);
 		priv->value_data_up_to_date = TRUE;
 	}
 

src/arvgvcp.c

@@ -27,6 +27,7 @@
 
 #include <arvgvcpprivate.h>
 #include <arvgvspprivate.h>
+#include <arvmiscprivate.h>
 #include <arvenumtypes.h>
 #include <arvenumtypesprivate.h>
 #include <string.h>
@@ -487,7 +488,6 @@ char *
 arv_gvcp_packet_flags_to_string_new (ArvGvcpCommand command, guint8 flags)
 {
 	GString *string = g_string_new ("");
-	char *buffer = NULL;
 	unsigned i;
 
 	for (i = 0; i < 8; i++) {
@@ -518,11 +518,7 @@ arv_gvcp_packet_flags_to_string_new (ArvGvcpCommand command, guint8 flags)
 	if (string->len == 0)
 		g_string_append (string, "none");
 
-	buffer = string->str;
-
-	g_string_free (string, FALSE);
-
-	return buffer;
+        return arv_g_string_free_and_steal(string);
 }
 
 /**
@@ -572,7 +568,6 @@ char *
 arv_gvcp_packet_to_string (const ArvGvcpPacket *packet)
 {
 	GString *string;
-	char *c_string;
 	char *data;
 	int packet_size;
 	guint32 value;
@@ -663,11 +658,7 @@ arv_gvcp_packet_to_string (const ArvGvcpPacket *packet)
 
 	arv_g_string_append_hex_dump (string, packet, packet_size);
 
-	c_string = string->str;
-
-	g_string_free (string, FALSE);
-
-	return c_string;
+        return arv_g_string_free_and_steal(string);
 }
 
 /**

src/arvgvsp.c

@@ -26,7 +26,7 @@
  */
 
 #include <arvdebug.h>
-#include <arvmisc.h>
+#include <arvmiscprivate.h>
 #include <arvenumtypes.h>
 #include <arvgvspprivate.h>
 #include <arvenumtypesprivate.h>
@@ -173,7 +173,6 @@ arv_gvsp_packet_to_string (const ArvGvspPacket *packet, size_t packet_size)
         guint part_id;
         ptrdiff_t offset;
 	GString *string;
-	char *c_string;
 
 	string = g_string_new ("");
 
@@ -275,11 +274,7 @@ arv_gvsp_packet_to_string (const ArvGvspPacket *packet, size_t packet_size)
                         break;
         }
 
-	c_string = string->str;
-
-	g_string_free (string, FALSE);
-
-	return c_string;
+        return arv_g_string_free_and_steal(string);
 }
 
 void

src/arvmisc.c

@@ -279,7 +279,6 @@ arv_histogram_to_string (const ArvHistogram *histogram)
 	int i, j, bin_max;
 	gboolean max_found = FALSE;
 	GString *string;
-	char *str;
 
 	g_return_val_if_fail (histogram != NULL, NULL);
 
@@ -369,10 +368,7 @@ arv_histogram_to_string (const ArvHistogram *histogram)
 		g_string_append_printf (string, ":%12llu", (unsigned long long) histogram->variables[j].counter);
 	}
 
-	str = string->str;
-	g_string_free (string, FALSE);
-
-	return str;
+        return arv_g_string_free_and_steal(string);
 }
 
 ArvValue *
@@ -1158,3 +1154,17 @@ arv_regex_new_from_glob_pattern (const char *glob, gboolean caseless)
 
 	return regex;
 }
+
+char *
+arv_g_string_free_and_steal (GString *string)
+{
+#if GLIB_CHECK_VERSION(2,75,4)
+        return g_string_free_and_steal(string);
+#else
+        char *buffer = string->str;
+
+        g_string_free (string, FALSE);
+
+        return buffer;
+#endif
+}

src/arvmiscprivate.h

@@ -66,6 +66,10 @@ double 		arv_value_get_double 		(ArvValue *value);
 gboolean 	arv_value_holds_int64 		(ArvValue *value);
 double 		arv_value_holds_double 		(ArvValue *value);
 
+/* Compatibility functions */
+
+char *          arv_g_string_free_and_steal     (GString *string) G_GNUC_WARN_UNUSED_RESULT;
+
 /* private, but used by tests */
 ARV_API gboolean	arv_parse_genicam_url	(const char *url, gssize url_length,
 						 char **scheme, char **authority, char **path,

src/arvuvcp.c

@@ -25,6 +25,7 @@
  * @short_description: USB3Vision control packet handling
  */
 
+#include <arvmiscprivate.h>
 #include <arvuvcpprivate.h>
 #include <arvenumtypesprivate.h>
 #include <arvdebug.h>
@@ -148,7 +149,6 @@ arv_uvcp_packet_to_string (const ArvUvcpPacket *packet)
 {
 	ArvUvcpCommand command;
 	GString *string;
-	char *c_string;
 	int packet_size;
 	guint64 value;
 
@@ -206,11 +206,7 @@ arv_uvcp_packet_to_string (const ArvUvcpPacket *packet)
 
 	arv_g_string_append_hex_dump (string, packet, packet_size);
 
-	c_string = string->str;
-
-	g_string_free (string, FALSE);
-
-	return c_string;
+        return arv_g_string_free_and_steal(string);
 }
 
 /**

src/arvuvsp.c

@@ -22,7 +22,7 @@
 
 #include <arvuvspprivate.h>
 #include <arvstr.h>
-#include <arvmisc.h>
+#include <arvmiscprivate.h>
 
 /*
  * SECTION: arvuvsp
@@ -44,7 +44,6 @@ arv_uvsp_packet_to_string (const ArvUvspPacket *packet)
 	ArvUvspLeader *leader = (ArvUvspLeader *) packet;
 	ArvUvspTrailer *trailer = (ArvUvspTrailer *) packet;
 	GString *string;
-	char *c_string;
 
 	g_return_val_if_fail (packet != NULL, NULL);
 
@@ -101,11 +100,7 @@ arv_uvsp_packet_to_string (const ArvUvspPacket *packet)
 	}
 #endif
 
-	c_string = string->str;
-
-	g_string_free (string, FALSE);
-
-	return c_string;
+        return arv_g_string_free_and_steal(string);
 }
 
 /**