From 85c342932c60954a7e1c9430742bfff2b28c31a8 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 28 Jan 2011 16:27:37 +0100 Subject: [PATCH] Kill "if" before free, and useless cast of free argument. free(NULL) is a no-op, there is no need to test the given pointer before call. The same argument stands for xbt_free, xbt_dict_free, xbt_dynar_free, and xbt_strbuff_free. --- examples/gras/replay/xbt_workload.c | 9 +++------ examples/msg/actions/actions.c | 21 +++++++-------------- include/xbt/sysdep.h | 4 +--- src/amok/PeerManagement/peermanagement.c | 3 +-- src/bindings/lua/lua_stub_generator.c | 4 +++- src/gras/DataDesc/cbps.c | 3 +-- src/gras/DataDesc/ddt_create.c | 3 +-- src/gras/Transport/transport_plugin_sg.c | 9 +++------ src/gras/Transport/transport_plugin_tcp.c | 9 +++------ src/gras/Virtu/process.c | 3 +-- src/gras/Virtu/sg_emul.c | 3 +-- src/gras/gras.c | 3 +-- src/include/surf/surf_resource.h | 6 ++---- src/instr/jedule/jedule_platform.c | 4 +--- src/mc/memory_map.c | 3 +-- src/msg/msg_actions.c | 3 +-- src/rngstreams/RngStream.c | 3 +-- src/simdag/sd_global.c | 13 ++++--------- src/simdag/sd_task.c | 3 +-- src/simix/smx_context_base.c | 3 +-- src/simix/smx_process.c | 7 ++----- src/smpi/smpi_bench.c | 12 +++--------- src/surf/cpu.c | 3 +-- src/surf/cpu_im.c | 3 +-- src/surf/cpu_ti.c | 6 ++---- src/surf/network.c | 3 +-- src/surf/network_gtnets.c | 3 +-- src/surf/network_im.c | 3 +-- src/surf/network_ns3.c | 6 ++---- src/surf/surf.c | 3 +-- src/surf/surf_routing.c | 9 +++------ src/surf/surf_routing_dijkstra.c | 10 +++------- src/surf/surfxml_parse.c | 6 ++---- src/surf/workstation_ptask_L07.c | 3 +-- src/xbt/backtrace_linux.c | 3 +-- src/xbt/dict_cursor.c | 6 ++---- src/xbt/dynar.c | 1 - src/xbt/ex.c | 22 ++++++++-------------- src/xbt/graphxml_parse.c | 6 ++---- src/xbt/lib.c | 6 ++---- src/xbt/log.c | 3 +-- src/xbt/mmalloc/mm_legacy.c | 3 +-- src/xbt/xbt_os_thread.c | 3 +-- src/xbt/xbt_peer.c | 3 +-- src/xbt/xbt_replay_trace_reader.c | 6 ++---- src/xbt/xbt_strbuff.c | 6 ++---- tools/gras/stub_generator.c | 3 +-- tools/tesh/run_context.c | 21 +++++++-------------- tools/tesh/tesh.c | 3 +-- win32_test_app/src/TBuffer.c | 6 ++---- win32_test_app/src/TStream.c | 6 ++---- win32_test_app/src/TTestCaseContext.c | 4 +--- win32_test_app/src/TThreadDynarray.c | 6 ++---- 53 files changed, 101 insertions(+), 205 deletions(-) diff --git a/examples/gras/replay/xbt_workload.c b/examples/gras/replay/xbt_workload.c index f3b3ddf2c2..f16e41fee1 100644 --- a/examples/gras/replay/xbt_workload.c +++ b/examples/gras/replay/xbt_workload.c @@ -71,12 +71,9 @@ void xbt_workload_elm_free(xbt_workload_elm_t cmd) { if (!cmd) return; - if (cmd->who) - free(cmd->who); - if (cmd->comment) - free(cmd->comment); - if (cmd->str_arg) - free(cmd->str_arg); + free(cmd->who); + free(cmd->comment); + free(cmd->str_arg); free(cmd); } diff --git a/examples/msg/actions/actions.c b/examples/msg/actions/actions.c index ca75da4b3e..85a00a08d5 100644 --- a/examples/msg/actions/actions.c +++ b/examples/msg/actions/actions.c @@ -87,8 +87,7 @@ static void action_send(const char *const *action) XBT_VERB("%s %f", name, MSG_get_clock() - clock); - if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - free(name); + free(name); #ifdef HAVE_TRACING TRACE_smpi_ptp_out(rank, rank, dst_traced, "send"); @@ -145,8 +144,7 @@ static void action_recv(const char *const *action) MSG_task_destroy(task); } - if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - free(name); + free(name); #ifdef HAVE_TRACING TRACE_smpi_ptp_out(rank, src_traced, rank, "recv"); TRACE_smpi_recv(rank, src_traced, rank); @@ -219,8 +217,7 @@ static void action_wait(const char *const *action) MSG_task_destroy(task); XBT_VERB("%s %f", name, MSG_get_clock() - clock); - if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - free(name); + free(name); #ifdef HAVE_TRACING TRACE_smpi_ptp_out(rank, src_traced, rank, "wait"); TRACE_smpi_recv(rank, src_traced, rank); @@ -264,8 +261,7 @@ static void action_barrier(const char *const *action) mutex=NULL; } - if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - free(name); + free(name); } @@ -386,8 +382,7 @@ static void action_sleep(const char *const *action) MSG_process_sleep(parse_double(duration)); XBT_VERB("%s %f ", name, MSG_get_clock() - clock); - if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - free(name); + free(name); } static void action_allReduce(const char *const *action) { @@ -472,8 +467,7 @@ static void action_comm_size(const char *const *action) name = xbt_str_join_array(action, " "); communicator_size = parse_double(size); XBT_VERB("%s %f", name, MSG_get_clock() - clock); - if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - free(name); + free(name); } static void action_compute(const char *const *action) @@ -489,8 +483,7 @@ static void action_compute(const char *const *action) MSG_task_execute(task); MSG_task_destroy(task); XBT_VERB("%s %f", name, MSG_get_clock() - clock); - if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - free(name); + free(name); } static void action_init(const char *const *action) diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h index 90be945c57..696dd69395 100644 --- a/include/xbt/sysdep.h +++ b/include/xbt/sysdep.h @@ -128,9 +128,7 @@ void *xbt_realloc(void *p, size_t s) res = xbt_malloc(s); } } else { - if (p) { - free(p); - } + free(p); } return res; } diff --git a/src/amok/PeerManagement/peermanagement.c b/src/amok/PeerManagement/peermanagement.c index 704b72ebc0..a842c92423 100644 --- a/src/amok/PeerManagement/peermanagement.c +++ b/src/amok/PeerManagement/peermanagement.c @@ -283,8 +283,7 @@ static void _amok_pm_leave(void *p) /* moddata */ amok_pm_moddata_t mod = (amok_pm_moddata_t) p; - if (mod->groups) - xbt_dict_free(&mod->groups); + xbt_dict_free(&mod->groups); /* callbacks */ gras_cb_unregister("amok_pm_kill", &amok_pm_cb_kill); diff --git a/src/bindings/lua/lua_stub_generator.c b/src/bindings/lua/lua_stub_generator.c index 87e2c8ce2a..07911e826c 100644 --- a/src/bindings/lua/lua_stub_generator.c +++ b/src/bindings/lua/lua_stub_generator.c @@ -67,7 +67,9 @@ const char *SIM_MAIN_POSTEMBULE = "\n" "\n" " /* cleanup the place */\n" " gras_clean();\n" - " if (gras_log)\n" " free(gras_log);\n" " return 0;\n" "}\n"; + " free(gras_log);\n" + " return 0;\n" + "}\n"; /*************************************** diff --git a/src/gras/DataDesc/cbps.c b/src/gras/DataDesc/cbps.c index b64eb2f10c..145560fa92 100644 --- a/src/gras/DataDesc/cbps.c +++ b/src/gras/DataDesc/cbps.c @@ -282,8 +282,7 @@ void gras_cbps_block_end(gras_cbps_t ps) xbt_dynar_free_container(&varstack); /*already empty, save a test ;) */ } - if (var->data) - free(var->data); + free(var->data); free(var); free(name); } diff --git a/src/gras/DataDesc/ddt_create.c b/src/gras/DataDesc/ddt_create.c index 05eb79e766..ece97c0889 100644 --- a/src/gras/DataDesc/ddt_create.c +++ b/src/gras/DataDesc/ddt_create.c @@ -158,8 +158,7 @@ void gras_dd_cat_field_free(void *f) gras_dd_cat_field_t field = *(gras_dd_cat_field_t *) f; XBT_IN(""); if (field) { - if (field->name) - free(field->name); + free(field->name); free(field); } XBT_OUT(); diff --git a/src/gras/Transport/transport_plugin_sg.c b/src/gras/Transport/transport_plugin_sg.c index 3f90e48ed8..0ec86e3ae5 100644 --- a/src/gras/Transport/transport_plugin_sg.c +++ b/src/gras/Transport/transport_plugin_sg.c @@ -274,10 +274,8 @@ void gras_trp_sg_socket_close(gras_socket_t sock) ("socket_close called on the unknown incoming socket %p (port=%d)", sock, sockdata->server_port); } - if (sock->data) { - /* FIXME: kill the rdv point if receiver side */ - free(sock->data); - } + /* FIXME: kill the rdv point if receiver side */ + free(sock->data); XBT_OUT(); } @@ -373,8 +371,7 @@ int gras_trp_sg_chunk_recv(gras_socket_t sock, if (data) memcpy(data, msg_got->payl, size); - if (msg_got->payl) - xbt_free(msg_got->payl); + xbt_free(msg_got->payl); xbt_free(msg_got); SIMIX_req_mutex_unlock(remote_sock_data->mutex); diff --git a/src/gras/Transport/transport_plugin_tcp.c b/src/gras/Transport/transport_plugin_tcp.c index ad90f80ca9..adf691ccd1 100644 --- a/src/gras/Transport/transport_plugin_tcp.c +++ b/src/gras/Transport/transport_plugin_tcp.c @@ -303,8 +303,7 @@ static void gras_trp_sock_socket_close(gras_socket_t sock) if (!sock) return; /* close only once */ - if (((gras_trp_tcp_sock_data_t)sock->data)->peer_name) - free(((gras_trp_tcp_sock_data_t)sock->data)->peer_name); + free(((gras_trp_tcp_sock_data_t)sock->data)->peer_name); free(sock->data); XBT_VERB("close tcp connection %d", sock->sd); @@ -757,16 +756,14 @@ void gras_trp_buf_socket_close(gras_socket_t sock) data->in_buf.size - data->in_buf.pos, data->in_buf.size, data->in_buf.pos); } - if (data->in_buf.data) - free(data->in_buf.data); + free(data->in_buf.data); if (data->out_buf.size != data->out_buf.pos) { XBT_DEBUG("Flush the socket before closing (in=%d,out=%d)", data->in_buf.size, data->out_buf.size); gras_trp_bufiov_flush(sock); } - if (data->out_buf.data) - free(data->out_buf.data); + free(data->out_buf.data); #ifdef HAVE_READV if (data->in_buf_v) { diff --git a/src/gras/Virtu/process.c b/src/gras/Virtu/process.c index c0cf02fe5a..36949b378d 100644 --- a/src/gras/Virtu/process.c +++ b/src/gras/Virtu/process.c @@ -179,8 +179,7 @@ void gras_procdata_exit() const char *gras_os_hostport() { static char *res = NULL; - if (res) - free(res); /* my port may have changed */ + free(res); /* my port may have changed */ res = bprintf("%s:%d", gras_os_myname(), gras_os_myport()); return (const char *) res; } diff --git a/src/gras/Virtu/sg_emul.c b/src/gras/Virtu/sg_emul.c index 63d8b77c7b..7892f4ce33 100644 --- a/src/gras/Virtu/sg_emul.c +++ b/src/gras/Virtu/sg_emul.c @@ -48,8 +48,7 @@ void gras_emul_init(void) void gras_emul_exit(void) { - if (locbuf) - free(locbuf); + free(locbuf); xbt_dict_free(&benchmark_set); xbt_os_timer_free(timer); } diff --git a/src/gras/gras.c b/src/gras/gras.c index 73615c52e5..c810ef1442 100644 --- a/src/gras/gras.c +++ b/src/gras/gras.c @@ -175,8 +175,7 @@ const char *hexa_str(unsigned char *data, int size, int downside) int begin, increment; if (buffsize < 5 * (size + 1)) { - if (buff) - free(buff); + free(buff); buffsize = 5 * (size + 1); buff = xbt_malloc(buffsize); } diff --git a/src/include/surf/surf_resource.h b/src/include/surf/surf_resource.h index d0a14d53d5..dc66869fdd 100644 --- a/src/include/surf/surf_resource.h +++ b/src/include/surf/surf_resource.h @@ -24,10 +24,8 @@ static XBT_INLINE static XBT_INLINE void surf_resource_free(void *r) { surf_resource_t resource = r; - if (resource->name) - free(resource->name); - if (resource->properties) - xbt_dict_free(&resource->properties); + free(resource->name); + xbt_dict_free(&resource->properties); free(resource); } diff --git a/src/instr/jedule/jedule_platform.c b/src/instr/jedule/jedule_platform.c index 6ffefdaea5..ebcfa4bb4f 100644 --- a/src/instr/jedule/jedule_platform.c +++ b/src/instr/jedule/jedule_platform.c @@ -46,9 +46,7 @@ static int compare_ids(const void *num1, const void *num2) { static void jed_free_container(jed_simgrid_container_t container) { xbt_dict_free(&container->name2id); - if( container->resource_list != NULL ) { - xbt_dynar_free(&container->resource_list); - } + xbt_dynar_free(&container->resource_list); if( container->container_children != NULL ) { unsigned int iter; diff --git a/src/mc/memory_map.c b/src/mc/memory_map.c index e5ea6c8b01..7496b501db 100644 --- a/src/mc/memory_map.c +++ b/src/mc/memory_map.c @@ -133,8 +133,7 @@ memory_map_t get_memory_map(void) ret->mapsize++; } - if (line) - free(line); + free(line); return ret; } diff --git a/src/msg/msg_actions.c b/src/msg/msg_actions.c index 5ac10d13da..5fbdd7aea7 100644 --- a/src/msg/msg_actions.c +++ b/src/msg/msg_actions.c @@ -186,8 +186,7 @@ MSG_error_t MSG_action_trace_run(char *path) } } - if (action_line) - free(action_line); + free(action_line); if (path) fclose(action_fp); xbt_dict_free(&action_queues); diff --git a/src/rngstreams/RngStream.c b/src/rngstreams/RngStream.c index de1416b9fe..eb4f69598c 100644 --- a/src/rngstreams/RngStream.c +++ b/src/rngstreams/RngStream.c @@ -339,8 +339,7 @@ void RngStream_DeleteStream (RngStream * p) { if (*p == NULL) return; - if ((*p)->name != NULL) - free ((*p)->name); + free((*p)->name); free (*p); *p = NULL; } diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c index a9065e35c7..7a1a385dc4 100644 --- a/src/simdag/sd_global.c +++ b/src/simdag/sd_global.c @@ -395,15 +395,10 @@ void SD_exit(void) xbt_mallocator_free(sd_global->task_mallocator); - XBT_DEBUG("Destroying workstation and link arrays if necessary..."); - if (sd_global->workstation_list != NULL) - xbt_free(sd_global->workstation_list); - - if (sd_global->link_list != NULL) - xbt_free(sd_global->link_list); - - if (sd_global->recyclable_route != NULL) - xbt_free(sd_global->recyclable_route); + XBT_DEBUG("Destroying workstation and link arrays..."); + xbt_free(sd_global->workstation_list); + xbt_free(sd_global->link_list); + xbt_free(sd_global->recyclable_route); XBT_DEBUG("Destroying the swags..."); xbt_swag_free(sd_global->not_scheduled_task_set); diff --git a/src/simdag/sd_task.c b/src/simdag/sd_task.c index 7546cc4f55..fc156666b9 100644 --- a/src/simdag/sd_task.c +++ b/src/simdag/sd_task.c @@ -413,8 +413,7 @@ void SD_task_dotty(SD_task_t task, void *out) */ static void __SD_task_dependency_destroy(void *dependency) { - if (((SD_dependency_t) dependency)->name != NULL) - xbt_free(((SD_dependency_t) dependency)->name); + xbt_free(((SD_dependency_t)dependency)->name); xbt_free(dependency); } diff --git a/src/simix/smx_context_base.c b/src/simix/smx_context_base.c index 810ef6cb59..1a5d14087d 100644 --- a/src/simix/smx_context_base.c +++ b/src/simix/smx_context_base.c @@ -72,8 +72,7 @@ void smx_ctx_base_free(smx_context_t context) /* free argv */ if (context->argv) { for (i = 0; i < context->argc; i++) - if (context->argv[i]) - free(context->argv[i]); + free(context->argv[i]); free(context->argv); } diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c index f2f550cebf..ed3c7560fa 100644 --- a/src/simix/smx_process.c +++ b/src/simix/smx_process.c @@ -100,15 +100,12 @@ void SIMIX_process_empty_trash(void) SIMIX_context_free(process->context); /* Free the exception allocated at creation time */ - if (process->running_ctx) - free(process->running_ctx); - if (process->properties) - xbt_dict_free(&process->properties); + free(process->running_ctx); + xbt_dict_free(&process->properties); xbt_fifo_free(process->comms); free(process->name); - process->name = NULL; free(process); } } diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c index 5a0e491d71..80c1896159 100644 --- a/src/smpi/smpi_bench.c +++ b/src/smpi/smpi_bench.c @@ -36,15 +36,9 @@ typedef struct { void smpi_bench_destroy(void) { - if (allocs) { - xbt_dict_free(&allocs); - } - if (samples) { - xbt_dict_free(&samples); - } - if(calls) { - xbt_dict_free(&calls); - } + xbt_dict_free(&allocs); + xbt_dict_free(&samples); + xbt_dict_free(&calls); } static void smpi_execute_flops(double flops) diff --git a/src/surf/cpu.c b/src/surf/cpu.c index f7ba2ce51b..b0d69b5ceb 100644 --- a/src/surf/cpu.c +++ b/src/surf/cpu.c @@ -144,8 +144,7 @@ static int cpu_action_unref(surf_action_t action) lmm_variable_free(cpu_maxmin_system, ((surf_action_cpu_Cas01_t) action)->variable); #ifdef HAVE_TRACING - if (action->category) - xbt_free(action->category); + xbt_free(action->category); #endif surf_action_free(&action); return 1; diff --git a/src/surf/cpu_im.c b/src/surf/cpu_im.c index eec52e0188..0c29222db7 100644 --- a/src/surf/cpu_im.c +++ b/src/surf/cpu_im.c @@ -162,8 +162,7 @@ static int cpu_im_action_unref(surf_action_t action) ((cpu_Cas01_im_t) ACTION_GET_CPU(action))->action_set); xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu); #ifdef HAVE_TRACING - if (action->category) - xbt_free(action->category); + xbt_free(action->category); #endif surf_action_free(&action); return 1; diff --git a/src/surf/cpu_ti.c b/src/surf/cpu_ti.c index 38834c59e6..ab3bad8771 100644 --- a/src/surf/cpu_ti.c +++ b/src/surf/cpu_ti.c @@ -50,10 +50,8 @@ static int surf_cpu_ti_binary_search(double *array, double a, int low, static void surf_cpu_ti_free_trace(surf_cpu_ti_trace_t trace) { - if (trace->time_points) - xbt_free(trace->time_points); - if (trace->integral) - xbt_free(trace->integral); + xbt_free(trace->time_points); + xbt_free(trace->integral); xbt_free(trace); } diff --git a/src/surf/network.c b/src/surf/network.c index 634c897839..57dc5442b6 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -318,8 +318,7 @@ static int net_action_unref(surf_action_t action) #ifdef HAVE_TRACING xbt_free(((surf_action_network_CM02_t) action)->src_name); xbt_free(((surf_action_network_CM02_t) action)->dst_name); - if (action->category) - xbt_free(action->category); + xbt_free(action->category); #endif surf_action_free(&action); return 1; diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c index 3667fb8829..035c80a832 100644 --- a/src/surf/network_gtnets.c +++ b/src/surf/network_gtnets.c @@ -170,8 +170,7 @@ static int action_unref(surf_action_t action) if (!action->refcount) { xbt_swag_remove(action, action->state_set); #ifdef HAVE_TRACING - if (action->category) - xbt_free(action->category); + xbt_free(action->category); #endif surf_action_free(&action); return 1; diff --git a/src/surf/network_im.c b/src/surf/network_im.c index fc12e428d8..84c28250e9 100644 --- a/src/surf/network_im.c +++ b/src/surf/network_im.c @@ -295,8 +295,7 @@ static int im_net_action_unref(surf_action_t action) #ifdef HAVE_TRACING xbt_free(((surf_action_network_CM02_im_t) action)->src_name); xbt_free(((surf_action_network_CM02_im_t) action)->dst_name); - if (action->category) - xbt_free(action->category); + xbt_free(action->category); #endif surf_action_free(&action); return 1; diff --git a/src/surf/network_ns3.c b/src/surf/network_ns3.c index 31b26d5a81..c1ede45b22 100644 --- a/src/surf/network_ns3.c +++ b/src/surf/network_ns3.c @@ -79,8 +79,7 @@ void parse_ns3_add_host(void) } static void ns3_free_dynar(void * elmts){ - if(elmts) - free(elmts); + free(elmts); return; } @@ -548,8 +547,7 @@ static int action_unref(surf_action_t action) #ifdef HAVE_TRACING xbt_free(((surf_action_network_ns3_t)action)->src_name); xbt_free(((surf_action_network_ns3_t)action)->dst_name); - if (action->category) - xbt_free(action->category); + xbt_free(action->category); #endif XBT_DEBUG ("Removing action %p", action); surf_action_free(&action); diff --git a/src/surf/surf.c b/src/surf/surf.c index 9a57398ac6..dfdafbda1c 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -387,8 +387,7 @@ void surf_exit(void) } surf_action_exit(); - if (surf_path) - xbt_dynar_free(&surf_path); + xbt_dynar_free(&surf_path); xbt_lib_free(&host_lib); xbt_lib_free(&link_lib); diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index aa8daeae97..b5a2578952 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -1197,10 +1197,8 @@ void generic_free_extended_route(route_extended_t e_route) { if (e_route) { xbt_dynar_free(&(e_route->generic_route.link_list)); - if (e_route->src_gateway) - xbt_free(e_route->src_gateway); - if (e_route->dst_gateway) - xbt_free(e_route->dst_gateway); + xbt_free(e_route->src_gateway); + xbt_free(e_route->dst_gateway); xbt_free(e_route); } } @@ -1437,8 +1435,7 @@ static void routing_parse_cluster(void) bprintf("%s%s_router%s", struct_cluster->prefix, struct_cluster->id, struct_cluster->suffix); sg_platf_new_router(&router); - if (newid) - free(newid); + free(newid); //Make the backbone if ((struct_cluster->bb_bw != 0) && (struct_cluster->bb_lat != 0)) { diff --git a/src/surf/surf_routing_dijkstra.c b/src/surf/surf_routing_dijkstra.c index cced8132db..a27f9aa5a1 100644 --- a/src/surf/surf_routing_dijkstra.c +++ b/src/surf/surf_routing_dijkstra.c @@ -50,9 +50,7 @@ static void route_cache_elem_free(void *e) static void graph_node_map_elem_free(void *e) { graph_node_map_element_t elm = (graph_node_map_element_t) e; - if (elm) { - xbt_free(elm); - } + xbt_free(elm); } static void graph_edge_data_free(void *e) @@ -60,10 +58,8 @@ static void graph_edge_data_free(void *e) route_extended_t e_route = (route_extended_t) e; if (e_route) { xbt_dynar_free(&(e_route->generic_route.link_list)); - if (e_route->src_gateway) - xbt_free(e_route->src_gateway); - if (e_route->dst_gateway) - xbt_free(e_route->dst_gateway); + xbt_free(e_route->src_gateway); + xbt_free(e_route->dst_gateway); xbt_free(e_route); } } diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 3ee3d56374..0723683a35 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -495,10 +495,8 @@ void surf_parse_open(const char *file) void surf_parse_close(void) { - if (surf_input_buffer_stack) - xbt_dynar_free(&surf_input_buffer_stack); - if (surf_file_to_parse_stack) - xbt_dynar_free(&surf_file_to_parse_stack); + xbt_dynar_free(&surf_input_buffer_stack); + xbt_dynar_free(&surf_file_to_parse_stack); if (surf_file_to_parse) { surf_parse__delete_buffer(surf_input_buffer); diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c index 0752e8846d..e642573795 100644 --- a/src/surf/workstation_ptask_L07.c +++ b/src/surf/workstation_ptask_L07.c @@ -404,8 +404,7 @@ static void ptask_update_resource_state(void *id, static void ptask_finalize(void) { - if (ptask_parallel_task_link_set != NULL) - xbt_dict_free(&ptask_parallel_task_link_set); + xbt_dict_free(&ptask_parallel_task_link_set); surf_model_exit(surf_workstation_model); surf_workstation_model = NULL; diff --git a/src/xbt/backtrace_linux.c b/src/xbt/backtrace_linux.c index e4eda28d87..966070ad62 100644 --- a/src/xbt/backtrace_linux.c +++ b/src/xbt/backtrace_linux.c @@ -92,8 +92,7 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e) char *data; xbt_dynar_foreach(path, cpt, data) { - if (binary_name) - free(binary_name); + free(binary_name); binary_name = bprintf("%s/%s", data, xbt_binary_name); if (!stat(binary_name, &stat_buf)) { /* Found. */ diff --git a/src/xbt/dict_cursor.c b/src/xbt/dict_cursor.c index 44f9f56492..6d7f27703e 100644 --- a/src/xbt/dict_cursor.c +++ b/src/xbt/dict_cursor.c @@ -51,10 +51,8 @@ XBT_INLINE xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t dict) */ XBT_INLINE void xbt_dict_cursor_free(xbt_dict_cursor_t * cursor) { - if (*cursor) { - xbt_free(*cursor); - *cursor = NULL; - } + xbt_free(*cursor); + *cursor = NULL; } /* diff --git a/src/xbt/dynar.c b/src/xbt/dynar.c index 87d4aa8ac8..3df1edf1d5 100644 --- a/src/xbt/dynar.c +++ b/src/xbt/dynar.c @@ -259,7 +259,6 @@ XBT_INLINE void xbt_dynar_reset(xbt_dynar_t const dynar) _dynar_map(dynar, dynar->free_f); } /* - if (dynar->data) free(dynar->data); dynar->size = 0; diff --git a/src/xbt/ex.c b/src/xbt/ex.c index 7f46a21b6d..26d7d3d5eb 100644 --- a/src/xbt/ex.c +++ b/src/xbt/ex.c @@ -187,8 +187,7 @@ void xbt_ex_free(xbt_ex_t e) { int i; - if (e.msg) - free(e.msg); + free(e.msg); if (e.remote) { free(e.procname); free(e.file); @@ -198,8 +197,8 @@ void xbt_ex_free(xbt_ex_t e) if (e.bt_strings) { for (i = 0; i < e.used; i++) - free((char *) e.bt_strings[i]); - free((char **) e.bt_strings); + free(e.bt_strings[i]); + free(e.bt_strings); } /* memset(e,0,sizeof(xbt_ex_t)); */ } @@ -393,12 +392,9 @@ static void bad_example(void) strcpy(cp2, "bar"); } TRY_CLEANUP { - if (cp3 != NULL) - free(cp3); - if (cp2 != NULL) - free(cp2); - if (cp1 != NULL) - free(cp1); + free(cp3); + free(cp2); + free(cp1); } CATCH_ANONYMOUS { printf("cp3=%s", cp3); @@ -431,10 +427,8 @@ static void good_example(void) } TRY_CLEANUP { /*04 */ printf("cp3=%s", cp3 == NULL /*02 */ ? "" : cp3); - if (cp3 != NULL) - free(cp3); - if (cp2 != NULL) - free(cp2); + free(cp3); + free(cp2); /*05 cp1 was given away */ } CATCH_ANONYMOUS { diff --git a/src/xbt/graphxml_parse.c b/src/xbt/graphxml_parse.c index e5700e43e6..89582e7117 100644 --- a/src/xbt/graphxml_parse.c +++ b/src/xbt/graphxml_parse.c @@ -103,10 +103,8 @@ void xbt_graph_parse_open(const char *file) void xbt_graph_parse_close(void) { - if (xbt_graph_input_buffer_stack) - xbt_dynar_free(&xbt_graph_input_buffer_stack); - if (xbt_graph_file_to_parse_stack) - xbt_dynar_free(&xbt_graph_file_to_parse_stack); + xbt_dynar_free(&xbt_graph_input_buffer_stack); + xbt_dynar_free(&xbt_graph_file_to_parse_stack); if (xbt_graph_file_to_parse) { xbt_graph_parse__delete_buffer(xbt_graph_input_buffer); diff --git a/src/xbt/lib.c b/src/xbt/lib.c index 66dc889cac..189da87e92 100644 --- a/src/xbt/lib.c +++ b/src/xbt/lib.c @@ -445,10 +445,8 @@ int xbt_lib_cursor_get_or_free(xbt_lib_cursor_t * cursor, static void xbt_lib_cursor_free(xbt_lib_cursor_t * cursor) { - if (*cursor) { - xbt_free(*cursor); - *cursor = NULL; - } + xbt_free(*cursor); + *cursor = NULL; } void xbt_lib_cursor_step(xbt_lib_cursor_t cursor) diff --git a/src/xbt/log.c b/src/xbt/log.c index 172a082cf7..1a29248df9 100644 --- a/src/xbt/log.c +++ b/src/xbt/log.c @@ -486,8 +486,7 @@ static void _free_setting(void *s) xbt_log_setting_t set = *(xbt_log_setting_t *) s; if (set) { free(set->catname); - if (set->fmt) - free(set->fmt); + free(set->fmt); free(set); } } diff --git a/src/xbt/mmalloc/mm_legacy.c b/src/xbt/mmalloc/mm_legacy.c index 2bced98dd1..a780f1340f 100644 --- a/src/xbt/mmalloc/mm_legacy.c +++ b/src/xbt/mmalloc/mm_legacy.c @@ -71,8 +71,7 @@ void *realloc(void *p, size_t s) else ret = mmalloc(mdp, s); } else { - if (p) - mfree(mdp, p); + mfree(mdp, p); } UNLOCK(mdp); diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c index b2be4c7fe6..c79d8f8aeb 100644 --- a/src/xbt/xbt_os_thread.c +++ b/src/xbt/xbt_os_thread.c @@ -729,8 +729,7 @@ void xbt_os_thread_join(xbt_os_thread_t thread, void **thread_return) CloseHandle(thread->handle); - if (thread->name) - free(thread->name); + free(thread->name); free(thread); } diff --git a/src/xbt/xbt_peer.c b/src/xbt/xbt_peer.c index 23d7ca4911..80dae08705 100644 --- a/src/xbt/xbt_peer.c +++ b/src/xbt/xbt_peer.c @@ -48,8 +48,7 @@ xbt_peer_t xbt_peer_from_string(const char *peerport) void xbt_peer_free(xbt_peer_t peer) { if (peer) { - if (peer->name) - free(peer->name); + free(peer->name); free(peer); } } diff --git a/src/xbt/xbt_replay_trace_reader.c b/src/xbt/xbt_replay_trace_reader.c index 0c02352a0e..70f2af8fd9 100644 --- a/src/xbt/xbt_replay_trace_reader.c +++ b/src/xbt/xbt_replay_trace_reader.c @@ -34,8 +34,7 @@ xbt_replay_trace_reader_t xbt_replay_trace_reader_new(const char *filename) const char *xbt_replay_trace_reader_position(xbt_replay_trace_reader_t reader) { - if (reader->position) - free(reader->position); + free(reader->position); reader->position = bprintf("%s:%d",reader->filename,reader->linenum); return reader->position; } @@ -67,8 +66,7 @@ const char **xbt_replay_trace_reader_get(xbt_replay_trace_reader_t reader) void xbt_replay_trace_reader_free(xbt_replay_trace_reader_t *reader) { free((*reader)->filename); - if ((*reader)->position) - free((*reader)->position); + free((*reader)->position); fclose((*reader)->fp); free((*reader)->line); free(*reader); diff --git a/src/xbt/xbt_strbuff.c b/src/xbt/xbt_strbuff.c index 4af89927a9..16835fd961 100644 --- a/src/xbt/xbt_strbuff.c +++ b/src/xbt/xbt_strbuff.c @@ -60,8 +60,7 @@ XBT_INLINE void xbt_strbuff_free_container(xbt_strbuff_t b) XBT_INLINE void xbt_strbuff_free(xbt_strbuff_t b) { if (b) { - if (b->data) - free(b->data); + free(b->data); free(b); } } @@ -272,8 +271,7 @@ void xbt_strbuff_varsubst(xbt_strbuff_t b, xbt_dict_t patterns) } free(value); - if (default_value) - free(default_value); + free(default_value); end--; /* compensate the next end++ */ } diff --git a/tools/gras/stub_generator.c b/tools/gras/stub_generator.c index dfe760ce2d..5de317aa19 100644 --- a/tools/gras/stub_generator.c +++ b/tools/gras/stub_generator.c @@ -169,8 +169,7 @@ int main(int argc, char *argv[]) generate_simulation_dsp_file(project_name); generate_real_live_dsp_file(project_name); - if (__gras_path) - xbt_free(__gras_path); + xbt_free(__gras_path); #endif free(warning); diff --git a/tools/tesh/run_context.c b/tools/tesh/run_context.c index f734a41c16..e06b9f66f0 100644 --- a/tools/tesh/run_context.c +++ b/tools/tesh/run_context.c @@ -189,14 +189,12 @@ void rctx_empty(rctx_t rc) char **env_it; void *filepos; - if (rc->cmd) - free(rc->cmd); + free(rc->cmd); rc->cmd = NULL; /* avoid race with rctx_armageddon log messages */ filepos = rc->filepos; rc->filepos = NULL; - if (filepos) - free(filepos); + free(filepos); for (i = 0, env_it = environ; *env_it; i++, env_it++); if (rc->env) { for (env_it = rctx->env + i; *env_it; env_it++) @@ -241,10 +239,8 @@ void rctx_free(rctx_t rctx) if (!rctx) return; - if (rctx->cmd) - free(rctx->cmd); - if (rctx->filepos) - free(rctx->filepos); + free(rctx->cmd); + free(rctx->filepos); if (rctx->env) { int i; char **env_it; @@ -526,8 +522,7 @@ static void start_command(rctx_t rctx) xbt_dynar_t path = xbt_str_split(environ[i] + 5, ":"); xbt_dynar_foreach(path, it, str) { - if (binary_name) - free(binary_name); + free(binary_name); binary_name = bprintf("%s/%s", str, args[0]); if (!stat(binary_name, &stat_buf)) { /* Found. */ @@ -811,10 +806,8 @@ void *rctx_wait(void *r) } rctx->expected_return = 0; - if (rctx->expected_signal) { - free(rctx->expected_signal); - rctx->expected_signal = NULL; - } + free(rctx->expected_signal); + rctx->expected_signal = NULL; } if ((errcode && errcode != 1) || rctx->interrupted) { diff --git a/tools/tesh/tesh.c b/tools/tesh/tesh.c index b4659fcf0a..f23c3be90b 100644 --- a/tools/tesh/tesh.c +++ b/tools/tesh/tesh.c @@ -172,8 +172,7 @@ static void handle_suite(const char *filename, FILE * IN) rctx_free(rctx); /* Clear buffers */ - if (line) - free(line); + free(line); xbt_strbuff_free(buff); } diff --git a/win32_test_app/src/TBuffer.c b/win32_test_app/src/TBuffer.c index 787b3f9527..cd41e18622 100644 --- a/win32_test_app/src/TBuffer.c +++ b/win32_test_app/src/TBuffer.c @@ -100,11 +100,9 @@ void Buffer_free(Buffer_t buffer) if (NULL == buffer) return; - if (NULL != buffer->data) - free(buffer->data); + free(buffer->data); - if (NULL != buffer) - free(buffer); + free(buffer); } /* diff --git a/win32_test_app/src/TStream.c b/win32_test_app/src/TStream.c index d2517ff183..da18135d95 100644 --- a/win32_test_app/src/TStream.c +++ b/win32_test_app/src/TStream.c @@ -209,8 +209,7 @@ void Stream_free(Stream_t ptr) if ((NULL != ptr->file) && (stdin != ptr->file)) fclose(ptr->file); - if (NULL != ptr->line) - free(ptr->line); + free(ptr->line); DeleteCriticalSection(&cs); @@ -483,8 +482,7 @@ void Stream_printLine(Stream_t stream, line_type_t line_type) */ } - if (__date) - free(__date); + free(__date); Stream_unlock(stream); } diff --git a/win32_test_app/src/TTestCaseContext.c b/win32_test_app/src/TTestCaseContext.c index 1682238110..ed14c542c3 100644 --- a/win32_test_app/src/TTestCaseContext.c +++ b/win32_test_app/src/TTestCaseContext.c @@ -253,9 +253,7 @@ void TestCaseContext_setName(TestCaseContext_t context, char *name) { size_t size; - if (NULL != context->name) { - free(context->name); - } + free(context->name); context->name = strdup(name); size = strlen(name); diff --git a/win32_test_app/src/TThreadDynarray.c b/win32_test_app/src/TThreadDynarray.c index 73f75437d5..0691116091 100644 --- a/win32_test_app/src/TThreadDynarray.c +++ b/win32_test_app/src/TThreadDynarray.c @@ -241,10 +241,8 @@ void ThreadDynarray_clear(ThreadDynarray_t ptr) { ThreadDynarray_lock(ptr); - if (ptr->threads) { - free(ptr->threads); - ptr->threads = NULL; - } + free(ptr->threads); + ptr->threads = NULL; ptr->count = 0; ptr->capacity = 0; -- 2.30.2