Remove unnecessary NULL checks before g_free()

g_free() is NULL-safe

17 files changed, 26 insertions, 57 deletions

diff --git a/sys/acmenc/acmenc.c b/sys/acmenc/acmenc.c
index 99a080424..67f5efb34 100644
--- a/sys/acmenc/acmenc.c
+++ b/sys/acmenc/acmenc.c
@@ -261,10 +261,8 @@ acmenc_teardown (ACMEnc * enc)
     gst_caps_unref (enc->output_caps);
     enc->output_caps = NULL;
   }
-  if (enc->header.pbSrc)
-    g_free (enc->header.pbSrc);
-  if (enc->header.pbDst)
-    g_free (enc->header.pbDst);
+  g_free (enc->header.pbSrc);
+  g_free (enc->header.pbDst);
   memset (&enc->header, 0, sizeof (enc->header));
   if (enc->stream) {
     acmStreamClose (enc->stream, 0);
diff --git a/sys/acmmp3dec/acmmp3dec.c b/sys/acmmp3dec/acmmp3dec.c
index e6d34baa7..737d4a001 100644
--- a/sys/acmmp3dec/acmmp3dec.c
+++ b/sys/acmmp3dec/acmmp3dec.c
@@ -201,10 +201,8 @@ acmmp3dec_teardown (ACMMP3Dec * dec)
 
   if (dec->header.fdwStatus & ACMSTREAMHEADER_STATUSF_PREPARED)
     acmStreamUnprepareHeader (dec->stream, &dec->header, 0);
-  if (dec->header.pbSrc)
-    g_free (dec->header.pbSrc);
-  if (dec->header.pbDst)
-    g_free (dec->header.pbDst);
+  g_free (dec->header.pbSrc);
+  g_free (dec->header.pbDst);
   memset (&dec->header, 0, sizeof (dec->header));
 
   if (dec->stream) {
diff --git a/sys/applemedia/avfassetsrc.m b/sys/applemedia/avfassetsrc.m
index 0aaf3adcf..81931a4e4 100644
--- a/sys/applemedia/avfassetsrc.m
+++ b/sys/applemedia/avfassetsrc.m
@@ -208,9 +208,7 @@ gst_avf_asset_src_set_property (GObject * object, guint prop_id,
 
   switch (prop_id) {
     case PROP_URI:
-      if (self->uri) {
-        g_free (self->uri);
-      }
+      g_free (self->uri);
       self->uri = g_value_dup_string (value);
       break;
     default:
@@ -820,9 +818,7 @@ gst_avf_asset_src_uri_set_uri (GstURIHandler * handler, const gchar * uri, GErro
 
   if (asset.playable) {
     ret = TRUE;
-    if (self->uri) {
-      g_free (self->uri);
-    }
+    g_free (self->uri);
     self->uri = g_strdup (uri);
   } else {
     g_set_error (error, GST_URI_ERROR, GST_URI_ERROR_BAD_URI,
diff --git a/sys/bluez/gsta2dpsink.c b/sys/bluez/gsta2dpsink.c
index 7b9f92245..424b56c19 100644
--- a/sys/bluez/gsta2dpsink.c
+++ b/sys/bluez/gsta2dpsink.c
@@ -157,8 +157,7 @@ gst_a2dp_sink_set_property (GObject * object, guint prop_id,
       if (self->sink != NULL)
         gst_avdtp_sink_set_device (self->sink, g_value_get_string (value));
 
-      if (self->device != NULL)
-        g_free (self->device);
+      g_free (self->device);
       self->device = g_value_dup_string (value);
       break;
 
@@ -166,8 +165,7 @@ gst_a2dp_sink_set_property (GObject * object, guint prop_id,
       if (self->sink != NULL)
         gst_avdtp_sink_set_transport (self->sink, g_value_get_string (value));
 
-      if (self->transport != NULL)
-        g_free (self->transport);
+      g_free (self->transport);
       self->transport = g_value_dup_string (value);
       break;
 
diff --git a/sys/bluez/gstavdtpsink.c b/sys/bluez/gstavdtpsink.c
index 70dc742a5..0f72a743a 100644
--- a/sys/bluez/gstavdtpsink.c
+++ b/sys/bluez/gstavdtpsink.c
@@ -451,8 +451,7 @@ gst_avdtp_sink_get_link_mtu (GstAvdtpSink * sink)
 void
 gst_avdtp_sink_set_device (GstAvdtpSink * self, const gchar * dev)
 {
-  if (self->conn.device != NULL)
-    g_free (self->conn.device);
+  g_free (self->conn.device);
 
   GST_LOG_OBJECT (self, "Setting device: %s", dev);
   self->conn.device = g_strdup (dev);
@@ -461,8 +460,7 @@ gst_avdtp_sink_set_device (GstAvdtpSink * self, const gchar * dev)
 void
 gst_avdtp_sink_set_transport (GstAvdtpSink * self, const gchar * trans)
 {
-  if (self->conn.transport != NULL)
-    g_free (self->conn.transport);
+  g_free (self->conn.transport);
 
   GST_LOG_OBJECT (self, "Setting transport: %s", trans);
   self->conn.transport = g_strdup (trans);
diff --git a/sys/bluez/gstavdtputil.c b/sys/bluez/gstavdtputil.c
index a435c6a2a..efc4f4298 100644
--- a/sys/bluez/gstavdtputil.c
+++ b/sys/bluez/gstavdtputil.c
@@ -213,8 +213,7 @@ gst_avdtp_connection_reset (GstAvdtpConnection * conn)
 void
 gst_avdtp_connection_set_device (GstAvdtpConnection * conn, const char *device)
 {
-  if (conn->device)
-    g_free (conn->device);
+  g_free (conn->device);
 
   conn->device = g_strdup (device);
 }
@@ -223,8 +222,7 @@ void
 gst_avdtp_connection_set_transport (GstAvdtpConnection * conn,
     const char *transport)
 {
-  if (conn->transport)
-    g_free (conn->transport);
+  g_free (conn->transport);
 
   conn->transport = g_strdup (transport);
 }
diff --git a/sys/dshowdecwrapper/gstdshowaudiodec.cpp b/sys/dshowdecwrapper/gstdshowaudiodec.cpp
index caebec537..9fb83e5be 100644
--- a/sys/dshowdecwrapper/gstdshowaudiodec.cpp
+++ b/sys/dshowdecwrapper/gstdshowaudiodec.cpp
@@ -854,8 +854,7 @@ dshowaudiodec_set_output_format (GstDshowAudioDec *adec)
 static void
 dshowadec_free_mediatype (AM_MEDIA_TYPE *mediatype)
 {
-  if (mediatype->pbFormat)
-    g_free (mediatype->pbFormat);
+  g_free (mediatype->pbFormat);
   g_free (mediatype);
 }
 
diff --git a/sys/dshowdecwrapper/gstdshowvideodec.cpp b/sys/dshowdecwrapper/gstdshowvideodec.cpp
index eac0f724c..9c2f59cfc 100644
--- a/sys/dshowdecwrapper/gstdshowvideodec.cpp
+++ b/sys/dshowdecwrapper/gstdshowvideodec.cpp
@@ -845,8 +845,7 @@ end:
   if (caps_out)
     gst_caps_unref (caps_out);
   gst_object_unref (vdec);
-  if (input_vheader)
-    g_free (input_vheader);
+  g_free (input_vheader);
   if (srcfilter)
     srcfilter->Release();
   if (sinkfilter)
diff --git a/sys/dshowsrcwrapper/gstdshow.cpp b/sys/dshowsrcwrapper/gstdshow.cpp
index 4b658a349..705adc956 100644
--- a/sys/dshowsrcwrapper/gstdshow.cpp
+++ b/sys/dshowsrcwrapper/gstdshow.cpp
@@ -271,14 +271,12 @@ gst_dshow_find_filter (CLSID input_majortype, CLSID input_subtype,
       filter_temp->Release ();
     }
 
-    if (friendly_name)
-      g_free (friendly_name);
+    g_free (friendly_name);
     moniker->Release ();
   }
 
 clean:
-  if (prefered_filter_upper)
-    g_free (prefered_filter_upper);
+  g_free (prefered_filter_upper);
   if (enum_moniker)
     enum_moniker->Release ();
   if (mapper)
diff --git a/sys/dshowsrcwrapper/gstdshowvideosrc.cpp b/sys/dshowsrcwrapper/gstdshowvideosrc.cpp
index 846c050d1..7725fcb1a 100644
--- a/sys/dshowsrcwrapper/gstdshowvideosrc.cpp
+++ b/sys/dshowsrcwrapper/gstdshowvideosrc.cpp
@@ -396,9 +396,7 @@ gst_dshowvideosrc_get_caps (GstBaseSrc * basesrc, GstCaps * filter)
     }
   }
 
-  if (unidevice) {
-    g_free (unidevice);
-  }
+  g_free (unidevice);
 
   if (src->caps) {
     GstCaps *caps;
diff --git a/sys/dshowvideosink/dshowvideosink.cpp b/sys/dshowvideosink/dshowvideosink.cpp
index cd7b2120a..c3d4bc341 100644
--- a/sys/dshowvideosink/dshowvideosink.cpp
+++ b/sys/dshowvideosink/dshowvideosink.cpp
@@ -285,8 +285,7 @@ gst_dshowvideosink_finalize (GObject * gobject)
 {
   GstDshowVideoSink *sink = GST_DSHOWVIDEOSINK (gobject);
 
-  if (sink->preferredrenderer)
-    g_free (sink->preferredrenderer);
+  g_free (sink->preferredrenderer);
 
   /* signal the COM thread that it sould uninitialize COM */
   if (sink->comInitialized) {
@@ -315,9 +314,7 @@ gst_dshowvideosink_set_property (GObject * object, guint prop_id,
 
   switch (prop_id) {
     case PROP_RENDERER:
-      if (sink->preferredrenderer)
-        g_free (sink->preferredrenderer);
-
+      g_free (sink->preferredrenderer);
       sink->preferredrenderer = g_value_dup_string (value);
       break;
     case PROP_KEEP_ASPECT_RATIO:
diff --git a/sys/dvb/camswclient.c b/sys/dvb/camswclient.c
index f5d07cf9b..68a3d43eb 100644
--- a/sys/dvb/camswclient.c
+++ b/sys/dvb/camswclient.c
@@ -52,8 +52,7 @@ reset_state (CamSwClient * client)
   if (client->sock)
     close (client->sock);
 
-  if (client->sock_path)
-    g_free (client->sock_path);
+  g_free (client->sock_path);
 }
 
 void
diff --git a/sys/dvb/dvbbasebin.c b/sys/dvb/dvbbasebin.c
index 2e6dcfd45..f003355ff 100644
--- a/sys/dvb/dvbbasebin.c
+++ b/sys/dvb/dvbbasebin.c
@@ -597,8 +597,7 @@ dvb_base_bin_set_program_numbers (DvbBaseBin * dvbbasebin, const gchar * pn)
 
   /* FIXME : Deactivate programs no longer selected */
 
-  if (dvbbasebin->program_numbers)
-    g_free (dvbbasebin->program_numbers);
+  g_free (dvbbasebin->program_numbers);
   dvbbasebin->program_numbers = g_strdup (pn);
 
   if (0)
diff --git a/sys/dvb/parsechannels.c b/sys/dvb/parsechannels.c
index 1a8158204..1d3058090 100644
--- a/sys/dvb/parsechannels.c
+++ b/sys/dvb/parsechannels.c
@@ -180,8 +180,7 @@ no_channels:
 static gboolean
 remove_channel_from_hash (gpointer key, gpointer value, gpointer user_data)
 {
-  if (key)
-    g_free (key);
+  g_free (key);
   if (value)
     g_hash_table_destroy ((GHashTable *) value);
   return TRUE;
diff --git a/sys/pvr2d/gstpvrvideosink.c b/sys/pvr2d/gstpvrvideosink.c
index 6d117fb90..7c1024376 100644
--- a/sys/pvr2d/gstpvrvideosink.c
+++ b/sys/pvr2d/gstpvrvideosink.c
@@ -1316,11 +1316,8 @@ gst_pvrvideosink_dcontext_free (GstDrawContext * dcontext)
 {
   GST_DEBUG ("Freeing dcontext %p", dcontext);
 
-  if (dcontext->p_blt_info)
-    g_free (dcontext->p_blt_info);
-
-  if (dcontext->p_blt2d_info)
-    g_free (dcontext->p_blt2d_info);
+  g_free (dcontext->p_blt_info);
+  g_free (dcontext->p_blt2d_info);
 
   if (dcontext->x_lock)
     g_mutex_lock (dcontext->x_lock);
diff --git a/sys/uvch264/gstuvch264_mjpgdemux.c b/sys/uvch264/gstuvch264_mjpgdemux.c
index 99734ad5a..1f9b1c405 100644
--- a/sys/uvch264/gstuvch264_mjpgdemux.c
+++ b/sys/uvch264/gstuvch264_mjpgdemux.c
@@ -296,8 +296,7 @@ gst_uvc_h264_mjpg_demux_dispose (GObject * object)
   if (self->priv->nv12_caps)
     gst_caps_unref (self->priv->nv12_caps);
   self->priv->nv12_caps = NULL;
-  if (self->priv->clock_samples)
-    g_free (self->priv->clock_samples);
+  g_free (self->priv->clock_samples);
   self->priv->clock_samples = NULL;
 
   G_OBJECT_CLASS (parent_class)->dispose (object);
diff --git a/sys/vdpau/gstvdpvideomemory.c b/sys/vdpau/gstvdpvideomemory.c
index 8d0fa5122..8217653d2 100644
--- a/sys/vdpau/gstvdpvideomemory.c
+++ b/sys/vdpau/gstvdpvideomemory.c
@@ -222,8 +222,7 @@ _vdp_video_mem_free (GstAllocator * allocator, GstMemory * mem)
 
   gst_object_unref (vmem->device);
 
-  if (vmem->cache)
-    g_free (vmem->cache);
+  g_free (vmem->cache);
 
   g_slice_free (GstVdpVideoMemory, vmem);
 }