gcc: fix gcc12 warnings

diff --git a/src/init_sockfd.c b/src/init_sockfd.c
index 44d1cc345dd271163a63933e9435c28b57b87bf9..babfe3c59c96dacfb7cdacd5fc0d77818792f197 100644 (file)
--- 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 6da2c0ba557145910ca56f4402f5ed8713ca1dff..a1d4dab6cd381195a5d27e763eeb82f6900ac305 100644 (file)
--- 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 1102b08ca628417339958386d6aef634f7e581f4..0877dbfa5388099082cb6d4a693e0a8383785583 100644 (file)
--- 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 ec33094d49ed128acc51b51cc34efba9072c89c9..523d3df2d89e3c51d33b19f79fa87630b201bfbf 100644 (file)
--- 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 922562f685c635f0b48b996b81081ae3838021c0..a6bfe9c74b6ea1d844fd383fdaae5eaacd3159f7 100644 (file)
--- 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 9b9fe348adf96aaf6575b08bb05878a6e4fc87b6..0bc34bfb351478db178d9f995aca5a6f4cf2f895 100644 (file)
--- 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