From 35cd7343563c3f0f6f6ad8c72e7810d817197bdf Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 26 Feb 2021 20:51:47 +0100 Subject: [PATCH] CLEANUP: config: replace a few free() with ha_free() A few occurrences of calls to free() to free a section name, peers name or server name were using casts and didn't include the trailing free, let's switch them to ha_free(). --- src/cfgparse.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cfgparse.c b/src/cfgparse.c index 2d712a4..5910513 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -2312,7 +2312,7 @@ int check_config_validity() target->conf.file, target->conf.line); cfgerr++; } else { - free((void *)rule->be.name); + ha_free(&rule->be.name); rule->be.backend = target; } } @@ -2364,7 +2364,7 @@ int check_config_validity() cfgerr++; continue; } - free((void *)srule->srv.name); + ha_free(&srule->srv.name); srule->srv.ptr = target; } @@ -2397,7 +2397,7 @@ int check_config_validity() cfgerr++; } else { - free((void *)mrule->table.name); + ha_free(&mrule->table.name); mrule->table.t = target; stktable_alloc_data_type(target, STKTABLE_DT_SERVER_ID, NULL); stktable_alloc_data_type(target, STKTABLE_DT_SERVER_KEY, NULL); @@ -2435,7 +2435,7 @@ int check_config_validity() cfgerr++; } else { - free((void *)mrule->table.name); + ha_free(&mrule->table.name); mrule->table.t = target; stktable_alloc_data_type(target, STKTABLE_DT_SERVER_ID, NULL); stktable_alloc_data_type(target, STKTABLE_DT_SERVER_KEY, NULL); @@ -2511,7 +2511,7 @@ int check_config_validity() for (curpeers = cfg_peers; curpeers; curpeers = curpeers->next) { if (strcmp(curpeers->id, curproxy->table->peers.name) == 0) { - free((void *)curproxy->table->peers.name); + ha_free(&curproxy->table->peers.name); curproxy->table->peers.p = curpeers; break; } @@ -2520,7 +2520,7 @@ int check_config_validity() if (!curpeers) { ha_alert("Proxy '%s': unable to find sync peers '%s'.\n", curproxy->id, curproxy->table->peers.name); - free((void *)curproxy->table->peers.name); + ha_free(&curproxy->table->peers.name); curproxy->table->peers.p = NULL; cfgerr++; } -- 1.7.10.4