From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Wed, 19 Oct 2016 18:18:48 +0000 (+0100)
Subject: Replace strlen(), malloc(), and sprintf() with concat().
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/b2a9e811e6c1d22a7c89909b6e061b7d94cb532f?ds=inline

Replace strlen(), malloc(), and sprintf() with concat().
---

diff --git a/sbr/oauth_prof.c b/sbr/oauth_prof.c
index a3f2e54a..e0fd7584 100644
--- a/sbr/oauth_prof.c
+++ b/sbr/oauth_prof.c
@@ -56,14 +56,8 @@ copy_svc(mh_oauth_service_info *to, const mh_oauth_service_info *from)
 char *
 mh_oauth_node_name_for_svc(const char *base_name, const char *svc)
 {
-    char *result = mh_xmalloc(sizeof "oauth-" - 1
-                              + strlen(svc)
-                              + 1            /* '-' */
-                              + strlen(base_name)
-                              + 1            /* '\0' */);
-    sprintf(result, "oauth-%s-%s", svc, base_name);
     /* TODO: s/_/-/g ? */
-    return result;
+    return concat("oauth-", svc, "-", base_name, NULL);
 }
 
 /* Update one service_info field if overridden in profile. */