From 19bbdc9bfcbbfabb1f04dad12ff1df5d7075bf11 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Wed, 10 Jul 2019 17:28:00 -0400 Subject: [PATCH] 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 Change-Id: Ifbbca48f04cc198543aaa5d06d3b906b32fdf137 Reviewed-on: https://review.lttng.org/c/babeltrace/+/1684 Tested-by: jenkins --- src/plugins/ctf/common/metadata/visitor-generate-ir.c | 8 ++------ src/plugins/ctf/fs-src/fs.c | 4 +--- src/plugins/ctf/fs-src/query.c | 4 +--- src/plugins/ctf/lttng-live/data-stream.c | 4 +--- src/plugins/lttng-utils/debug-info/trace-ir-mapping.c | 8 ++------ src/plugins/text/details/obj-lifetime-mgmt.c | 4 +--- src/plugins/text/dmesg/dmesg.c | 4 +--- src/python-plugin-provider/python-plugin-provider.c | 4 +--- 8 files changed, 10 insertions(+), 30 deletions(-) diff --git a/src/plugins/ctf/common/metadata/visitor-generate-ir.c b/src/plugins/ctf/common/metadata/visitor-generate-ir.c index 56e5b706..b0dd00ca 100644 --- 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 fb5fa1c5..0d9e8842 100644 --- 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 1ba84b4a..b9811b19 100644 --- 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 b94bbd38..c89cba52 100644 --- 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 ec074d5d..dfef517f 100644 --- 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 182c8b66..9547d609 100644 --- 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 7243bbb5..49fba13f 100644 --- 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 145d2200..5bdcbfcd 100644 --- 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; } -- 2.34.1