From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 4 Nov 2021 13:34:44 +0000 (+0100)
Subject: mlmmj-unsub: eliminate useless memory duplication
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c99e1d1019ca3dc16ac50345cddf1370fc652c02;p=thirdparty%2Fmlmmj.git

mlmmj-unsub: eliminate useless memory duplication
---

diff --git a/src/mlmmj-unsub.c b/src/mlmmj-unsub.c
index ce0a18b0..9b5405ac 100644
--- a/src/mlmmj-unsub.c
+++ b/src/mlmmj-unsub.c
@@ -96,7 +96,8 @@ static void notify_unsub(struct mlmmj_list *list, const char *subaddr,
 {
         char *fromaddr, *tostr;
 	text *txt;
-        char *queuefilename = NULL, *listtext;
+        char *queuefilename = NULL;
+	const char *listtext;
 
 	myasprintf(&fromaddr, "%s%sbounces-help@%s", list->name, list->delim,
 	    list->fqdn);
@@ -105,20 +106,19 @@ static void notify_unsub(struct mlmmj_list *list, const char *subaddr,
 	switch(typesub) {
 		default:
 		case SUB_NORMAL:
-			listtext = mystrdup("notifyunsub");
+			listtext = "notifyunsub";
 			break;
 		case SUB_DIGEST:
-			listtext = mystrdup("notifyunsub-digest");
+			listtext = "notifyunsub-digest";
 			break;
 		case SUB_NOMAIL:
-			listtext = mystrdup("notifyunsub-nomail");
+			listtext = "notifyunsub-nomail";
 			break;
 	}
 	
 	txt = open_text(list, "notify", "unsub",
 			subreason_strs[reasonsub], subtype_strs[typesub],
 			listtext);
-	myfree(listtext);
 	MY_ASSERT(txt);
 	register_unformatted(txt, "subaddr", subaddr);
 	register_unformatted(txt, "oldsub", subaddr); /* DEPRECATED */
@@ -142,7 +142,8 @@ static void generate_unsubconfirm(struct mlmmj_list *list, const char *subaddr,
 			   const char *mlmmjsend,
 			   enum subtype typesub, enum subreason reasonsub)
 {
-	char *confirmaddr, *tmpstr;
+	const char *tmpstr;
+	char *confirmaddr;
 	text *txt;
 	char *queuefilename, *fromaddr;
 	char *randomstr = NULL, *confirmfilename = NULL, *listtext;
@@ -182,16 +183,16 @@ static void generate_unsubconfirm(struct mlmmj_list *list, const char *subaddr,
 	switch(typesub) {
 		default:
 		case SUB_NORMAL:
-			listtext = mystrdup("unsub-confirm");
-			tmpstr = mystrdup("confunsub-");
+			listtext = "unsub-confirm";
+			tmpstr = "confunsub-";
 			break;
 		case SUB_DIGEST:
-			listtext = mystrdup("unsub-confirm-digest");
-			tmpstr = mystrdup("confunsub-digest-");
+			listtext = "unsub-confirm-digest";
+			tmpstr = "confunsub-digest-";
 			break;
 		case SUB_NOMAIL:
-			listtext = mystrdup("unsub-confirm-nomail");
-			tmpstr = mystrdup("confunsub-nomail-");
+			listtext = "unsub-confirm-nomail";
+			tmpstr = "confunsub-nomail-";
 			break;
 	}
 
@@ -199,12 +200,10 @@ static void generate_unsubconfirm(struct mlmmj_list *list, const char *subaddr,
 	    randomstr, list->fqdn);
 
 	myfree(randomstr);
-	myfree(tmpstr);
 
 	txt = open_text(list, "confirm", "unsub",
 			subreason_strs[reasonsub], subtype_strs[typesub],
 			listtext);
-	myfree(listtext);
 	MY_ASSERT(txt);
 	register_unformatted(txt, "subaddr", subaddr);
 	register_unformatted(txt, "confaddr", confirmaddr); /* DEPRECATED */