From: Volker Lendecke <vl@samba.org>
Date: Wed, 15 Jul 2026 10:01:25 +0000 (+0200)
Subject: ctdb: Simplify compact_args()
X-Git-Tag: tevent-0.17.2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8cd127a03023eaf5db05bcbfe9ce09eb27d47976;p=thirdparty%2Fsamba.git

ctdb: Simplify compact_args()

Use talloc_asprintf_addsep()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/ctdb/event/event_tool.c b/ctdb/event/event_tool.c
index 2599458d365..1512a8c052b 100644
--- a/ctdb/event/event_tool.c
+++ b/ctdb/event/event_tool.c
@@ -56,18 +56,14 @@ static int compact_args(TALLOC_CTX *mem_ctx,
 		return 0;
 	}
 
-	arg_str = talloc_strdup(mem_ctx, argv[from]);
-	if (arg_str == NULL) {
-		return ENOMEM;
+	arg_str = talloc_strdup(mem_ctx, "");
+	for (i = from; i < argc; i++) {
+		talloc_asprintf_addsep(&arg_str, " ", "%s", argv[i]);
 	}
 
-	for (i = from+1; i < argc; i++) {
-		arg_str = talloc_asprintf_append(arg_str, " %s", argv[i]);
-		if (arg_str == NULL) {
-			return ENOMEM;
-		}
+	if (arg_str == NULL) {
+		return ENOMEM;
 	}
-
 	*result = arg_str;
 	return 0;
 }