Do not check `NULL` to call g_free(): g_free() accepts `NULL`

Semantic patch:

    @@
    expression e;
    @@

    - if (e) { g_free(e); }
    + g_free(e);

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ifbbca48f04cc198543aaa5d06d3b906b32fdf137
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1684
Tested-by: jenkins <jenkins@lttng.org>

diff --git a/src/plugins/ctf/common/metadata/visitor-generate-ir.c b/src/plugins/ctf/common/metadata/visitor-generate-ir.c
index 56e5b70605471f3ab5164fd595d336120039029a..b0dd00cac6333e0568a45f18278c8b799194c9cf 100644 (file)
--- a/src/plugins/ctf/common/metadata/visitor-generate-ir.c
+++ b/src/plugins/ctf/common/metadata/visitor-generate-ir.c
@@ -3394,9 +3394,7 @@ int visit_event_decl_entry(struct ctx *ctx, struct ctf_node *node,
        goto end;
 
 error:
-       if (left) {
-               g_free(left);
-       }
+       g_free(left);
 
 end:
        return ret;
@@ -3571,9 +3569,7 @@ end:
                ctx_pop_scope(ctx);
        }
 
-       if (event_name) {
-               g_free(event_name);
-       }
+       g_free(event_name);
 
        return ret;
 }

diff --git a/src/plugins/ctf/fs-src/fs.c b/src/plugins/ctf/fs-src/fs.c
index fb5fa1c545f92accd8c1e0c422bacc178107043b..0d9e884207c0e5b34dce86888b2d8665edadf25e 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.c
+++ b/src/plugins/ctf/fs-src/fs.c
@@ -496,9 +496,7 @@ error:
        ret = -1;
 
 end:
-       if (port_name) {
-               g_free(port_name);
-       }
+       g_free(port_name);
 
        port_data_destroy(port_data);
        return ret;

diff --git a/src/plugins/ctf/fs-src/query.c b/src/plugins/ctf/fs-src/query.c
index 1ba84b4a8393200f566cf70b79f92b28722c0da2..b9811b1990a82af700576afe13754e6fb55ac795 100644 (file)
--- a/src/plugins/ctf/fs-src/query.c
+++ b/src/plugins/ctf/fs-src/query.c
@@ -357,9 +357,7 @@ int populate_stream_info(struct ctf_fs_ds_file_group *group,
        }
 
 end:
-       if (port_name) {
-               g_free(port_name);
-       }
+       g_free(port_name);
        bt_value_put_ref(file_paths);
        return ret;
 }

diff --git a/src/plugins/ctf/lttng-live/data-stream.c b/src/plugins/ctf/lttng-live/data-stream.c
index b94bbd382ce5be665785e2a3d979d8a54f0a23f6..c89cba5210d0ec0dc89c0f135f4e12900e782f72 100644 (file)
--- a/src/plugins/ctf/lttng-live/data-stream.c
+++ b/src/plugins/ctf/lttng-live/data-stream.c
@@ -267,9 +267,7 @@ void lttng_live_stream_iterator_destroy(
        if (stream_iter->msg_iter) {
                bt_msg_iter_destroy(stream_iter->msg_iter);
        }
-       if (stream_iter->buf) {
-               g_free(stream_iter->buf);
-       }
+       g_free(stream_iter->buf);
        if (stream_iter->name) {
                g_string_free(stream_iter->name, TRUE);
        }

diff --git a/src/plugins/lttng-utils/debug-info/trace-ir-mapping.c b/src/plugins/lttng-utils/debug-info/trace-ir-mapping.c
index ec074d5dc56a65c6cd831744eec98733d621efa6..dfef517f16e827eb124180335013c6e7a0699332 100644 (file)
--- a/src/plugins/lttng-utils/debug-info/trace-ir-mapping.c
+++ b/src/plugins/lttng-utils/debug-info/trace-ir-mapping.c
@@ -617,9 +617,7 @@ void trace_ir_metadata_maps_destroy(struct trace_ir_metadata_maps *maps)
                g_hash_table_destroy(maps->clock_class_map);
        }
 
-       if (maps->fc_resolving_ctx) {
-               g_free(maps->fc_resolving_ctx);
-       }
+       g_free(maps->fc_resolving_ctx);
 
        if (maps->output_trace_class) {
                bt_trace_class_put_ref(maps->output_trace_class);
@@ -656,9 +654,7 @@ void trace_ir_maps_destroy(struct trace_ir_maps *maps)
                return;
        }
 
-       if (maps->debug_info_field_class_name) {
-               g_free(maps->debug_info_field_class_name);
-       }
+       g_free(maps->debug_info_field_class_name);
 
        if (maps->data_maps) {
                g_hash_table_destroy(maps->data_maps);

diff --git a/src/plugins/text/details/obj-lifetime-mgmt.c b/src/plugins/text/details/obj-lifetime-mgmt.c
index 182c8b66ad3b03eafbf16973f6d8a0a139c65c3d..9547d609cb08884095acb462415788518e7d7479 100644 (file)
--- a/src/plugins/text/details/obj-lifetime-mgmt.c
+++ b/src/plugins/text/details/obj-lifetime-mgmt.c
@@ -232,9 +232,7 @@ error:
        ret = -1;
 
 end:
-       if (details_trace) {
-               g_free(details_trace);
-       }
+       g_free(details_trace);
 
        return ret;
 }

diff --git a/src/plugins/text/dmesg/dmesg.c b/src/plugins/text/dmesg/dmesg.c
index 7243bbb5d777dfdb28c416118f0b9a37ae6df297..49fba13f80221c9522aa033024017df7932beb93 100644 (file)
--- a/src/plugins/text/dmesg/dmesg.c
+++ b/src/plugins/text/dmesg/dmesg.c
@@ -296,9 +296,7 @@ error:
        ret = -1;
 
 end:
-       if (basename) {
-               g_free(basename);
-       }
+       g_free(basename);
 
        return ret;
 }

diff --git a/src/python-plugin-provider/python-plugin-provider.c b/src/python-plugin-provider/python-plugin-provider.c
index 145d2200527f4f11ad689633e29b7842a36d6adc..5bdcbfcd78c035ec4bbbd0a4249d8b7c077d1efb 100644 (file)
--- a/src/python-plugin-provider/python-plugin-provider.c
+++ b/src/python-plugin-provider/python-plugin-provider.c
@@ -758,9 +758,7 @@ end:
        bt_plugin_put_ref(plugin);
        Py_XDECREF(py_plugin_info);
 
-       if (basename) {
-               g_free(basename);
-       }
+       g_free(basename);
 
        return status;
 }