FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove unnecessary NULL checks before g_free()

Browse Source 
g_free() is NULL-safe
This commit is contained in:
Reynaldo H. Verdejo Pinochet 2015-11-17 15:23:17 -08:00 committed by Tim-Philipp Müller
parent c9fafe8445
commit 68e668168d
8 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext/gl/gstglbumper.c
View File

@ -329,8 +329,7 @@ gst_gl_bumper_set_property (GObject * object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_LOCATION: case PROP_LOCATION:
if (bumper->location != NULL) g_free (bumper->location);
g_free (bumper->location);
bumper->location = g_value_dup_string (value); bumper->location = g_value_dup_string (value);
break; break;
default: default:

3
ext/gl/gstgldifferencematte.c
View File

@ -236,8 +236,7 @@ gst_gl_differencematte_set_property (GObject * object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_LOCATION: case PROP_LOCATION:
if (differencematte->location != NULL) g_free (differencematte->location);
g_free (differencematte->location);
differencematte->bg_has_changed = TRUE; differencematte->bg_has_changed = TRUE;
differencematte->location = g_value_dup_string (value); differencematte->location = g_value_dup_string (value);
break; break;

12
ext/gl/gstglfiltershader.c
View File

@ -164,12 +164,10 @@ gst_gl_filtershader_finalize (GObject * object)
{ {
GstGLFilterShader *filtershader = GST_GL_FILTERSHADER (object); GstGLFilterShader *filtershader = GST_GL_FILTERSHADER (object);
if (filtershader->vertex) g_free (filtershader->vertex);
g_free (filtershader->vertex);
filtershader->vertex = NULL; filtershader->vertex = NULL;
if (filtershader->fragment) g_free (filtershader->fragment);
g_free (filtershader->fragment);
filtershader->fragment = NULL; filtershader->fragment = NULL;
if (filtershader->uniforms) if (filtershader->uniforms)
@ -195,16 +193,14 @@ gst_gl_filtershader_set_property (GObject * object, guint prop_id,
break; break;
case PROP_VERTEX: case PROP_VERTEX:
GST_OBJECT_LOCK (filtershader); GST_OBJECT_LOCK (filtershader);
if (filtershader->vertex) g_free (filtershader->vertex);
g_free (filtershader->vertex);
filtershader->vertex = g_value_dup_string (value); filtershader->vertex = g_value_dup_string (value);
filtershader->new_source = TRUE; filtershader->new_source = TRUE;
GST_OBJECT_UNLOCK (filtershader); GST_OBJECT_UNLOCK (filtershader);
break; break;
case PROP_FRAGMENT: case PROP_FRAGMENT:
GST_OBJECT_LOCK (filtershader); GST_OBJECT_LOCK (filtershader);
if (filtershader->fragment) g_free (filtershader->fragment);
g_free (filtershader->fragment);
filtershader->fragment = g_value_dup_string (value); filtershader->fragment = g_value_dup_string (value);
filtershader->new_source = TRUE; filtershader->new_source = TRUE;
GST_OBJECT_UNLOCK (filtershader); GST_OBJECT_UNLOCK (filtershader);

3
ext/gl/gstgloverlay.c
View File

@ -277,8 +277,7 @@ gst_gl_overlay_set_property (GObject * object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_LOCATION: case PROP_LOCATION:
if (overlay->location != NULL) g_free (overlay->location);
g_free (overlay->location);
overlay->location_has_changed = TRUE; overlay->location_has_changed = TRUE;
overlay->location = g_value_dup_string (value); overlay->location = g_value_dup_string (value);
break; break;

3
gst-libs/gst/gl/gstglfeature.c
View File

@ -189,8 +189,7 @@ _gst_gl_feature_check (GstGLContext * context,
for (func_num = 0; data->functions[func_num].name; func_num++) { for (func_num = 0; data->functions[func_num].name; func_num++) {
void *func; void *func;
if (full_function_name) g_free (full_function_name);
g_free (full_function_name);
full_function_name = g_strconcat ("gl", data->functions[func_num].name, full_function_name = g_strconcat ("gl", data->functions[func_num].name,
suffix, NULL); suffix, NULL);

3
gst-libs/gst/gl/gstglslstage.c
View File

@ -312,8 +312,7 @@ gst_glsl_stage_set_strings (GstGLSLStage * stage, GstGLSLVersion version,
if (stage->priv->n_strings < n_strings) { if (stage->priv->n_strings < n_strings) {
/* only realloc if we need more space */ /* only realloc if we need more space */
if (stage->priv->strings) g_free (stage->priv->strings);
g_free (stage->priv->strings);
stage->priv->strings = g_new0 (gchar *, n_strings); stage->priv->strings = g_new0 (gchar *, n_strings);
} }

3
gst-libs/gst/gl/gstglutils.c
View File

@ -461,8 +461,7 @@ gst_gl_context_set_error (GstGLContext * context, const char *format, ...)
{ {
va_list args; va_list args;
if (error_message) g_free (error_message);
g_free (error_message);
va_start (args, format); va_start (args, format);
error_message = g_strdup_vprintf (format, args); error_message = g_strdup_vprintf (format, args);

3
gst-libs/gst/gl/x11/gstgldisplay_x11.c
View File

@ -55,8 +55,7 @@ gst_gl_display_x11_finalize (GObject * object)
{ {
GstGLDisplayX11 *display_x11 = GST_GL_DISPLAY_X11 (object); GstGLDisplayX11 *display_x11 = GST_GL_DISPLAY_X11 (object);
if (display_x11->name) g_free (display_x11->name);
g_free (display_x11->name);
if (!display_x11->foreign_display && display_x11->display) { if (!display_x11->foreign_display && display_x11->display) {
XCloseDisplay (display_x11->display); XCloseDisplay (display_x11->display);