From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 13 Jan 2016 19:45:20 +0000 (+0100)
Subject: shared: simplify string concatenation with strjoin()
X-Git-Tag: v229~138^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45c4210ed606b1e3318bba7edb5c1b962764a1c2;p=thirdparty%2Fsystemd.git

shared: simplify string concatenation with strjoin()
---

diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
index d36eb5056f0..1235ff109bd 100644
--- a/src/shared/dns-domain.c
+++ b/src/shared/dns-domain.c
@@ -1143,17 +1143,15 @@ int dns_service_split(const char *joined, char **_name, char **_type, char **_do
                 if (x >= 3 && srv_type_label_is_valid(c, cn)) {
 
                         if (dns_service_name_label_is_valid(a, an)) {
-
                                 /* OK, got <name> . <type> . <type2> . <domain> */
 
                                 name = strndup(a, an);
                                 if (!name)
                                         return -ENOMEM;
 
-                                type = new(char, bn+1+cn+1);
+                                type = strjoin(b, ".", c, NULL);
                                 if (!type)
                                         return -ENOMEM;
-                                strcpy(stpcpy(stpcpy(type, b), "."), c);
 
                                 d = p;
                                 goto finish;
@@ -1165,10 +1163,9 @@ int dns_service_split(const char *joined, char **_name, char **_type, char **_do
 
                         name = NULL;
 
-                        type = new(char, an+1+bn+1);
+                        type = strjoin(a, ".", b, NULL);
                         if (!type)
                                 return -ENOMEM;
-                        strcpy(stpcpy(stpcpy(type, a), "."), b);
 
                         d = q;
                         goto finish;