mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-06-30 03:40:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

taglist, plugins: fix compiler warnings with GLib >= 2.76

Browse source 
Fix compiler warnings about not using the return value when
freeing the GString segment with g_string_free(.., FALSE):

    ignoring return value of ‘g_string_free_and_steal’ declared with attribute ‘warn_unused_result’

which we get with newer GLib versions. These were all harmless.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4273>
This commit is contained in:
Tim-Philipp Müller 2023-03-26 16:40:28 +01:00 committed by GStreamer Marge Bot
parent 94abeb1888
commit 330836db8e
6 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
subprojects/gst-plugins-bad/ext/teletextdec/gstteletextdec.c
View file

@ -874,9 +874,8 @@ gst_teletextdec_export_text_page (GstTeletextDec * teletext, vbi_page * page,
if (!g_strcmp0 (subs->str, "")) if (!g_strcmp0 (subs->str, ""))
g_string_append (subs, "\n"); g_string_append (subs, "\n");
text = subs->str;
size = subs->len + 1; size = subs->len + 1;
g_string_free (subs, FALSE); text = g_string_free (subs, FALSE);
g_strfreev (lines); g_strfreev (lines);
} else { } else {
size = page->columns * page->rows; size = page->columns * page->rows;
@ -935,6 +934,7 @@ gst_teletextdec_export_pango_page (GstTeletextDec * teletext, vbi_page * page,
gchar **lines; gchar **lines;
GString *subs; GString *subs;
guint start, stop, k; guint start, stop, k;
gsize len;
gint i, j; gint i, j;
colors = (gchar **) g_malloc (sizeof (gchar *) * (rows + 1)); colors = (gchar **) g_malloc (sizeof (gchar *) * (rows + 1));
@ -965,11 +965,11 @@ gst_teletextdec_export_pango_page (GstTeletextDec * teletext, vbi_page * page,
} }
/* Allocate new buffer */ /* Allocate new buffer */
*buf = gst_buffer_new_wrapped (subs->str, subs->len + 1); len = subs->len + 1;
*buf = gst_buffer_new_wrapped (g_string_free (subs, FALSE), len);
g_strfreev (lines); g_strfreev (lines);
g_strfreev (colors); g_strfreev (colors);
g_string_free (subs, FALSE);
return GST_FLOW_OK; return GST_FLOW_OK;
} }

3
subprojects/gst-plugins-bad/sys/winks/gstksvideodevice.c
View file

@ -237,8 +237,7 @@ gst_ks_video_device_parse_win32_error (const gchar * func_name,
: "failed to retrieve system error message"); : "failed to retrieve system error message");
} }
*ret_error_str = message->str; *ret_error_str = g_string_free (message, FALSE);
g_string_free (message, FALSE);
} }
} }

6
subprojects/gst-plugins-bad/sys/winks/kshelpers.c
View file

@ -383,7 +383,6 @@ ks_state_to_string (KSSTATE state)
gchar * gchar *
ks_options_flags_to_string (gulong flags) ks_options_flags_to_string (gulong flags)
{ {
gchar *ret;
GString *str; GString *str;
str = g_string_sized_new (128); str = g_string_sized_new (128);
@ -404,10 +403,7 @@ ks_options_flags_to_string (gulong flags)
if (flags != 0) if (flags != 0)
g_string_append_printf (str, "|0x%08x", (guint) flags); g_string_append_printf (str, "|0x%08x", (guint) flags);
ret = str->str; return g_string_free (str, FALSE);
g_string_free (str, FALSE);
return ret;
} }
typedef struct typedef struct

2
subprojects/gst-plugins-bad/tools/gst-app-maker
View file

@ -261,7 +261,7 @@ gst_replace_create_pipeline (GstReplace *replace)
if (verbose) g_print ("pipeline: %s\n", pipe_desc->str); if (verbose) g_print ("pipeline: %s\n", pipe_desc->str);
pipeline = (GstElement *) gst_parse_launch (pipe_desc->str, &error); pipeline = (GstElement *) gst_parse_launch (pipe_desc->str, &error);
g_string_free (pipe_desc, FALSE); g_string_free (pipe_desc, TRUE);
if (error) { if (error) {
g_print("pipeline parsing error: %s\n", error->message); g_print("pipeline parsing error: %s\n", error->message);

3
subprojects/gst-plugins-base/gst/subparse/gstsubparse.c
View file

@ -608,8 +608,7 @@ parse_mdvdsub (ParserState * state, const gchar * line)
break; break;
} }
} }
ret = markup->str; ret = g_string_free (markup, FALSE);
g_string_free (markup, FALSE);
GST_DEBUG ("parse_mdvdsub returning (%f+%f): %s", GST_DEBUG ("parse_mdvdsub returning (%f+%f): %s",
state->start_time / (double) GST_SECOND, state->start_time / (double) GST_SECOND,
state->duration / (double) GST_SECOND, ret); state->duration / (double) GST_SECOND, ret);

3
subprojects/gstreamer/gst/gsttaglist.c
View file

@ -455,8 +455,7 @@ gst_tag_merge_strings_with_comma (GValue * dest, const GValue * src)
} }
g_value_init (dest, G_TYPE_STRING); g_value_init (dest, G_TYPE_STRING);
g_value_take_string (dest, str->str); g_value_take_string (dest, g_string_free (str, FALSE));
g_string_free (str, FALSE);
} }
static GstTagInfo * static GstTagInfo *