From 762f5f5ca6350cc0b93c71f06abc963e13793e0e Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Mon, 30 Sep 2024 12:40:57 +1000 Subject: [PATCH] ctdb-server: Remove duplicate logic Initialise the pointer to NULL and fall through to let talloc_realloc() do the allocation. talloc_realloc() does the right thing with a NULL pointer... Signed-off-by: Martin Schwenke Reviewed-by: Volker Lendecke Reviewed-by: Jerry Heyman --- ctdb/server/ctdb_takeover.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c index 50bd512d0ef..1908c1f1f26 100644 --- a/ctdb/server/ctdb_takeover.c +++ b/ctdb/server/ctdb_takeover.c @@ -1560,18 +1560,7 @@ int32_t ctdb_control_tcp_add(struct ctdb_context *ctdb, vnn->tcp_array = tcparray; tcparray->num = 0; - tcparray->connections = talloc_size(tcparray, - sizeof(struct ctdb_connection)); - CTDB_NO_MEMORY(ctdb, tcparray->connections); - - tcparray->connections[tcparray->num].src = p->src; - tcparray->connections[tcparray->num].dst = p->dst; - tcparray->num++; - - if (tcp_update_needed) { - vnn->tcp_update_needed = true; - } - return 0; + tcparray->connections = NULL; } /* A new tickle, we must add it to the array */