From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 14 Apr 2023 11:30:16 +0000 (+0200)
Subject: get_bounce_from_addr: remove useless parameter
X-Git-Tag: RELEASE_1_4_0b1~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf70d6dd3bd7e5b99cba96c02fd9ae3ed154a32d;p=thirdparty%2Fmlmmj.git

get_bounce_from_addr: remove useless parameter
---

diff --git a/include/send_mail.h b/include/send_mail.h
index 2b7e8db2..97a1b028 100644
--- a/include/send_mail.h
+++ b/include/send_mail.h
@@ -45,6 +45,6 @@ bool send_single_mail(struct mail *mail, struct ml *ml, bool bounce);
 void save_queue(const char *queuefilename, struct mail *mail);
 bool requeuemail(int listfd, int index, strlist *addrs, const char *addr);
 char *bounce_from_adr(const char *recipient, const char *listadr, const char *listdelim, const char *mailfilename, int ctrlfd);
-char *get_bounce_from_adr(const char *recipient, struct ml *ml, const char *mailfilename, int index);
+char *get_bounce_from_adr(const char *recipient, struct ml *ml, int index);
 int get_index_from_filename(const char *filename);
 
diff --git a/src/listcontrol.c b/src/listcontrol.c
index afbf5176..4bb8942d 100644
--- a/src/listcontrol.c
+++ b/src/listcontrol.c
@@ -605,7 +605,7 @@ permit:
 		}
 		struct mail mail = { 0 };
 		mail.to = tll_front(*fromemails);
-		mail.from = get_bounce_from_adr(mail.to, ml, archivefilename, index);
+		mail.from = get_bounce_from_adr(mail.to, ml, index);
 		mail.fp = fdopen(fd, "r");
 		log_oper(ml->fd, OPLOGFNAME, "%s got archive/%s",
 				tll_front(*fromemails), param);
diff --git a/src/send_mail.c b/src/send_mail.c
index 9d3c2489..14660a1d 100644
--- a/src/send_mail.c
+++ b/src/send_mail.c
@@ -455,16 +455,13 @@ requeuemail(int listfd, int index, strlist *addrs, const char *addr)
 }
 
 char *
-get_bounce_from_adr(const char *recipient, struct ml *ml,
-    const char *mailfilename, int index)
+get_bounce_from_adr(const char *recipient, struct ml *ml, int index)
 {
 	char *bounceaddr, *myrecipient;
-	char *a = NULL, *mymailfilename;
+	char *a = NULL;
 	char *staticbounceaddr, *staticbounceaddr_localpart = NULL;
 	const char *staticbounceaddr_domain = NULL;
 
-	mymailfilename = xstrdup(mailfilename);
-
 	myrecipient = xstrdup(recipient);
 	a = strchr(myrecipient, '@');
 	if (a)
@@ -489,7 +486,6 @@ get_bounce_from_adr(const char *recipient, struct ml *ml,
 	}
 
 	free(myrecipient);
-	free(mymailfilename);
 
 	return bounceaddr;
 }