Remove unnecessary NULL checks before g_free()

g_free() is NULL-safe

diff --git a/ext/gl/gstglbumper.c b/ext/gl/gstglbumper.c
index 188663b4689554be41c64d80fb3ac43e6b38b67b..5820fac36916f0ad54a868ed45a2128cd82f9e8f 100644 (file)
--- a/ext/gl/gstglbumper.c
+++ b/ext/gl/gstglbumper.c
@@ -329,8 +329,7 @@ gst_gl_bumper_set_property (GObject * object, guint prop_id,
 
   switch (prop_id) {
     case PROP_LOCATION:
-      if (bumper->location != NULL)
-        g_free (bumper->location);
+      g_free (bumper->location);
       bumper->location = g_value_dup_string (value);
       break;
     default:

diff --git a/ext/gl/gstgldifferencematte.c b/ext/gl/gstgldifferencematte.c
index a746b3dfd0497a4c212014dc500a79f2bcb02929..8ffcf9b9311d1095da80e16ce1915c4a2e65ad78 100644 (file)
--- a/ext/gl/gstgldifferencematte.c
+++ b/ext/gl/gstgldifferencematte.c
@@ -236,8 +236,7 @@ gst_gl_differencematte_set_property (GObject * object, guint prop_id,
 
   switch (prop_id) {
     case PROP_LOCATION:
-      if (differencematte->location != NULL)
-        g_free (differencematte->location);
+      g_free (differencematte->location);
       differencematte->bg_has_changed = TRUE;
       differencematte->location = g_value_dup_string (value);
       break;

diff --git a/ext/gl/gstglfiltershader.c b/ext/gl/gstglfiltershader.c
index 8d3bb7fc6d467cbf17bac6aaba1acef021a340a1..510dcc44a646c145756c8d7a4c8ff866b8d40be4 100644 (file)
--- a/ext/gl/gstglfiltershader.c
+++ b/ext/gl/gstglfiltershader.c
@@ -164,12 +164,10 @@ gst_gl_filtershader_finalize (GObject * object)
 {
   GstGLFilterShader *filtershader = GST_GL_FILTERSHADER (object);
 
-  if (filtershader->vertex)
-    g_free (filtershader->vertex);
+  g_free (filtershader->vertex);
   filtershader->vertex = NULL;
 
-  if (filtershader->fragment)
-    g_free (filtershader->fragment);
+  g_free (filtershader->fragment);
   filtershader->fragment = NULL;
 
   if (filtershader->uniforms)
@@ -195,16 +193,14 @@ gst_gl_filtershader_set_property (GObject * object, guint prop_id,
       break;
     case PROP_VERTEX:
       GST_OBJECT_LOCK (filtershader);
-      if (filtershader->vertex)
-        g_free (filtershader->vertex);
+      g_free (filtershader->vertex);
       filtershader->vertex = g_value_dup_string (value);
       filtershader->new_source = TRUE;
       GST_OBJECT_UNLOCK (filtershader);
       break;
     case PROP_FRAGMENT:
       GST_OBJECT_LOCK (filtershader);
-      if (filtershader->fragment)
-        g_free (filtershader->fragment);
+      g_free (filtershader->fragment);
       filtershader->fragment = g_value_dup_string (value);
       filtershader->new_source = TRUE;
       GST_OBJECT_UNLOCK (filtershader);

diff --git a/ext/gl/gstgloverlay.c b/ext/gl/gstgloverlay.c
index d4c1ee1a18232df225771890b5e458aead081d34..a152fc22cb13d3fce5050ff049197390fef6f9eb 100644 (file)
--- a/ext/gl/gstgloverlay.c
+++ b/ext/gl/gstgloverlay.c
@@ -277,8 +277,7 @@ gst_gl_overlay_set_property (GObject * object, guint prop_id,
 
   switch (prop_id) {
     case PROP_LOCATION:
-      if (overlay->location != NULL)
-        g_free (overlay->location);
+      g_free (overlay->location);
       overlay->location_has_changed = TRUE;
       overlay->location = g_value_dup_string (value);
       break;

diff --git a/gst-libs/gst/gl/gstglfeature.c b/gst-libs/gst/gl/gstglfeature.c
index 4a5d876b526c9e2ad47694c3a0a0647100f86c31..862fadc4710b6b19d598917b5f6993ba2b184d0f 100644 (file)
--- a/gst-libs/gst/gl/gstglfeature.c
+++ b/gst-libs/gst/gl/gstglfeature.c
@@ -189,8 +189,7 @@ _gst_gl_feature_check (GstGLContext * context,
   for (func_num = 0; data->functions[func_num].name; func_num++) {
     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,
         suffix, NULL);

diff --git a/gst-libs/gst/gl/gstglslstage.c b/gst-libs/gst/gl/gstglslstage.c
index 05fde10392a4c322ee68aa31947d309f8eaa33ad..58132012619289c00dbe3991314e700ddc8be5b3 100644 (file)
--- a/gst-libs/gst/gl/gstglslstage.c
+++ b/gst-libs/gst/gl/gstglslstage.c
@@ -312,8 +312,7 @@ gst_glsl_stage_set_strings (GstGLSLStage * stage, GstGLSLVersion version,
 
   if (stage->priv->n_strings < n_strings) {
     /* 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);
   }
 

diff --git a/gst-libs/gst/gl/gstglutils.c b/gst-libs/gst/gl/gstglutils.c
index ae48d7c3124019efdabdf6ac2aebec375aa19892..a57bbda0d680628367fa8c7cefcccb8d8179eb19 100644 (file)
--- a/gst-libs/gst/gl/gstglutils.c
+++ b/gst-libs/gst/gl/gstglutils.c
@@ -461,8 +461,7 @@ gst_gl_context_set_error (GstGLContext * context, const char *format, ...)
 {
   va_list args;
 
-  if (error_message)
-    g_free (error_message);
+  g_free (error_message);
 
   va_start (args, format);
   error_message = g_strdup_vprintf (format, args);

diff --git a/gst-libs/gst/gl/x11/gstgldisplay_x11.c b/gst-libs/gst/gl/x11/gstgldisplay_x11.c
index e6086b7839a27c6a0f231489223a39a29bf96d15..696929eb8ec9b13692e5ce74fde215c0d87e7d33 100644 (file)
--- a/gst-libs/gst/gl/x11/gstgldisplay_x11.c
+++ b/gst-libs/gst/gl/x11/gstgldisplay_x11.c
@@ -55,8 +55,7 @@ gst_gl_display_x11_finalize (GObject * 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) {
     XCloseDisplay (display_x11->display);