From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 11 Jan 2025 12:27:49 +0000 (+0000)
Subject: parser: Refactor joining strings
X-Git-Tag: 0.9.30~466
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9945f5e8362ca02f16da43cc587add5862ab5f28;p=people%2Fms%2Fpakfire.git

parser: Refactor joining strings

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/pakfire/parser.c b/src/pakfire/parser.c
index 74a3f6c6b..6ece68982 100644
--- a/src/pakfire/parser.c
+++ b/src/pakfire/parser.c
@@ -265,11 +265,18 @@ static char* pakfire_parser_join(const char* c, const char* val1, const char* va
 	char* result = NULL;
 	int r;
 
+	if (!val1)
+		val1 = "";
+
+	if (!val2)
+		val2 = "";
+
+	// Reset the delimiter if we don't need it
+	if (!*val1 || !*val2)
+		c = "";
+
 	// Join both strings
-	r = asprintf(&result, "%s%s%s",
-			(val1) ? val1 : "",
-			(val1 && *val1 && val2 && *val2) ? c : "",
-			(val2) ? val2 : "");
+	r = asprintf(&result, "%s%s%s", val1, c, val2);
 	if (r < 0)
 		return NULL;