diff options
author | Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com> | 2017-03-21 16:22:50 -0700 |
---|---|---|
committer | Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com> | 2017-03-23 15:21:58 -0700 |
commit | b2ec10ace33a93d314013d1ad983d5a83950d8d0 (patch) | |
tree | 463c68b9c07a04a6a9238d02799123a84ac51760 | |
parent | 51a921b34b0f71cad5490e972ea33325268f5b56 (diff) |
validate: do not check for NULL before g_free()
g_free() is NULL-safe.
-rw-r--r-- | validate/gst-libs/gst/video/gssim.c | 3 | ||||
-rw-r--r-- | validate/gst/validate/gst-validate-reporter.c | 3 | ||||
-rw-r--r-- | validate/gst/validate/gst-validate-scenario.c | 9 | ||||
-rw-r--r-- | validate/gst/validate/media-descriptor.c | 11 |
4 files changed, 8 insertions, 18 deletions
diff --git a/validate/gst-libs/gst/video/gssim.c b/validate/gst-libs/gst/video/gssim.c index 434c14a..52d531b 100644 --- a/validate/gst-libs/gst/video/gssim.c +++ b/validate/gst-libs/gst/video/gssim.c @@ -376,9 +376,8 @@ gssim_configure (Gssim * self, gint width, gint height) g_free (self->priv->windows); self->priv->windows = NULL; - if (self->priv->orgmu) - g_free (self->priv->orgmu); + g_free (self->priv->orgmu); self->priv->orgmu = g_new (gfloat, width * height); return TRUE; diff --git a/validate/gst/validate/gst-validate-reporter.c b/validate/gst/validate/gst-validate-reporter.c index 0cb3431..ea6e284 100644 --- a/validate/gst/validate/gst-validate-reporter.c +++ b/validate/gst/validate/gst-validate-reporter.c @@ -320,8 +320,7 @@ gst_validate_reporter_set_name (GstValidateReporter * reporter, gchar * name) { GstValidateReporterPrivate *priv = gst_validate_reporter_get_priv (reporter); - if (priv->name) - g_free (priv->name); + g_free (priv->name); priv->name = name; } diff --git a/validate/gst/validate/gst-validate-scenario.c b/validate/gst/validate/gst-validate-scenario.c index 75ce586..71c70df 100644 --- a/validate/gst/validate/gst-validate-scenario.c +++ b/validate/gst/validate/gst-validate-scenario.c @@ -2257,8 +2257,7 @@ _execute_set_debug_threshold (GstValidateScenario * scenario, gst_debug_set_threshold_from_string (threshold_str, reset); - if (str) - g_free (str); + g_free (str); return TRUE; } @@ -2791,10 +2790,8 @@ gst_validate_scenario_load (GstValidateScenario * scenario, } /* else check scenario */ check_scenario: - if (tldir) - g_free (tldir); - if (lfilename) - g_free (lfilename); + g_free (tldir); + g_free (lfilename); if (!is_config) { if (found_actions == TRUE) diff --git a/validate/gst/validate/media-descriptor.c b/validate/gst/validate/media-descriptor.c index c5e891e..a48f9f0 100644 --- a/validate/gst/validate/media-descriptor.c +++ b/validate/gst/validate/media-descriptor.c @@ -76,12 +76,8 @@ free_streamnode (GstValidateMediaStreamNode * streamnode) if (streamnode->tags) free_tagsnode (streamnode->tags); - if (streamnode->padname) - g_free (streamnode->padname); - - if (streamnode->id) - g_free (streamnode->id); - + g_free (streamnode->padname); + g_free (streamnode->id); g_free (streamnode->str_open); g_free (streamnode->str_close); g_slice_free (GstValidateMediaStreamNode, streamnode); @@ -94,8 +90,7 @@ gst_validate_filenode_free (GstValidateMediaFileNode * filenode) if (filenode->tags) free_tagsnode (filenode->tags); - if (filenode->uri) - g_free (filenode->uri); + g_free (filenode->uri); if (filenode->caps) gst_caps_unref (filenode->caps); |