X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/82c05140c9784bddd74415f79c3b342ad908dceb..28ec221002d755d33c41fa4b5d9673eee0abef9d:/sbr/oauth_prof.c?ds=sidebyside

diff --git a/sbr/oauth_prof.c b/sbr/oauth_prof.c
index a3f2e54a..3dc50732 100644
--- a/sbr/oauth_prof.c
+++ b/sbr/oauth_prof.c
@@ -1,4 +1,5 @@
-/*
+/* oauth_prof.c -- OAuth 2.0 implementation for XOAUTH2 in SMTP and POP3.
+ *
  * This code is Copyright (c) 2014, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -56,14 +57,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. */
@@ -145,10 +140,7 @@ mh_oauth_cred_fn(const char *svc)
     free(component);
 
     if (result == NULL) {
-        result = mh_xmalloc(sizeof "oauth-" - 1
-                            + strlen(svc)
-                            + 1 /* '\0' */);
-        sprintf(result, "oauth-%s", svc);
+        result = concat("oauth-", svc, NULL);
         result_if_allocated = result;
     } else {
         result_if_allocated = NULL;