From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 14 Feb 2023 14:39:43 +0000 (+0100)
Subject: gcc: fix gcc12 warnings
X-Git-Tag: RELEASE_1_4_0b1~137
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=a79d4c4bbc2defbe2246022ea480ef89f74b5d4e;p=thirdparty%2Fmlmmj.git

gcc: fix gcc12 warnings
---

diff --git a/src/init_sockfd.c b/src/init_sockfd.c
index 44d1cc34..babfe3c5 100644
--- a/src/init_sockfd.c
+++ b/src/init_sockfd.c
@@ -37,7 +37,7 @@
 
 void init_sockfd(int *sockfd, const char *relayhost, unsigned short port)
 {
-	int on, sd;
+	int on, sd = -1;
 	struct addrinfo *ai = NULL, *curai, hints;
 	char srv[NI_MAXSERV];
 	*sockfd = -1;
diff --git a/src/mlmmj-bounce.c b/src/mlmmj-bounce.c
index 6da2c0ba..a1d4dab6 100644
--- a/src/mlmmj-bounce.c
+++ b/src/mlmmj-bounce.c
@@ -156,7 +156,7 @@ int main(int argc, char **argv)
 {
 	int opt, dsnbounce = 0;
 	char *address = NULL, *number = NULL;
-	const char *thisaddr;
+	const char *thisaddr = NULL;
 	char *a;
 	const char *mailname = NULL;
 	bool probe = false;
diff --git a/src/mlmmj-send.c b/src/mlmmj-send.c
index 1102b08c..0877dbfa 100644
--- a/src/mlmmj-send.c
+++ b/src/mlmmj-send.c
@@ -344,6 +344,7 @@ int send_mail_many_list(int sockfd, struct mail *mail, strlist *addrs,
 	char *bounceaddr, *addr;
 
 	tll_foreach(*addrs, it) {
+		bounceaddr = NULL;
 		addr = it->item;
 		if(strchr(addr, '@') == NULL) {
 			errno = 0;
@@ -411,7 +412,7 @@ int main(int argc, char **argv)
 {
 	int sockfd = -1, opt, mindex = 0, subfd = 0, tmpfd;
 	int deletewhensent = 1, sendres = 0, digest = 0;
-	bool archive = true, ctrlarchive;
+	bool archive = true, ctrlarchive = true;
 	int res;
 	char *mailfilename = NULL, *subfilename = NULL, *omit = NULL;
 	char *bounceaddr = NULL;
@@ -553,6 +554,7 @@ int main(int argc, char **argv)
 		break;
 	case '3':
 		mail.addtohdr = statctrl(ml.ctrlfd, "addtohdr");
+		/* FALLTHROUGH */
 	case '4': /* sending mails to subfile */
 		if((subfd = open(subfilename, O_RDONLY)) < 0) {
 			log_error(LOG_ARGS, "Could not open '%s':",
diff --git a/src/mlmmj-sub.c b/src/mlmmj-sub.c
index ec33094d..523d3df2 100644
--- a/src/mlmmj-sub.c
+++ b/src/mlmmj-sub.c
@@ -346,7 +346,6 @@ void generate_subconfirm(struct ml *ml, const char *subaddr,
 
 	if(dprintf(subconffd, "%s", subaddr) < 0) {
 		log_error(LOG_ARGS, "Could not write to subconffd");
-		free(confirmfilename);
                 free(randomstr);
 		exit(EXIT_FAILURE);
 	}
diff --git a/src/prepstdreply.c b/src/prepstdreply.c
index 922562f6..a6bfe9c7 100644
--- a/src/prepstdreply.c
+++ b/src/prepstdreply.c
@@ -1540,13 +1540,12 @@ prepstdreply_to(text *txt, struct ml *ml, const char *from, const char *to,
 	char *tmp, *line;
 	int i;
 	size_t len;
-	char *str;
 	char *headers[10] = { NULL }; /* relies on NULL to flag end */
 
 	for (i=0; i<6; i++) { 
 		tmp = xstrdup("randomN");
 		tmp[6] = '0' + i;
-		str = random_str();
+		char *str = random_str();
 		register_unformatted(txt, tmp, str);
 		free(tmp);
 		free(str);
@@ -1662,7 +1661,6 @@ prepstdreply_to(text *txt, struct ml *ml, const char *from, const char *to,
 	}
 	while(line) {
 			if(dprintf(tofd, "%s\n", line) < 0) {
-				free(str);
 				log_error(LOG_ARGS, "Could not write std mail");
 				goto freeandreturn;
 			}
diff --git a/tests/mlmmj.c b/tests/mlmmj.c
index 9b9fe348..0bc34bfb 100644
--- a/tests/mlmmj.c
+++ b/tests/mlmmj.c
@@ -228,7 +228,7 @@ ATF_TC_BODY(init_sock, tc)
 	if (p == 0) {
 		int s = fakesmtp(mypipe[1]);
 		int c;
-		struct sockaddr_in me, cl;
+		struct sockaddr_in cl;
 		socklen_t clsize = 0;
 		/*
 		 * Now we can accept incoming connections one