From 36ca37aa3d669a66a19100f4e2564d6cd1a1b999 Mon Sep 17 00:00:00 2001 From: Eduardo Chappa Date: Thu, 19 Aug 2021 21:15:42 -0600 Subject: [PATCH] * Clear out some warnings given by gcc-10. --- imap/src/c-client/imap4r1.c | 2 +- imap/src/c-client/json.c | 2 +- imap/src/c-client/oauth2_aux.c | 2 +- imap/src/c-client/pop3.c | 2 +- imap/src/c-client/smtp.c | 2 +- imap/src/c-client/utf8.c | 2 +- imap/src/osdep/unix/dummy.c | 2 +- imap/src/osdep/unix/tcp_unix.c | 5 +++-- pith/pine.hlp | 2 +- 9 files changed, 11 insertions(+), 10 deletions(-) diff --git a/imap/src/c-client/imap4r1.c b/imap/src/c-client/imap4r1.c index b4479e7..155b4d5 100644 --- a/imap/src/c-client/imap4r1.c +++ b/imap/src/c-client/imap4r1.c @@ -1186,7 +1186,7 @@ long imap_anon (MAILSTREAM *stream,char *tmp) long imap_auth (MAILSTREAM *stream,NETMBX *mb,char *tmp,char *usr) { - unsigned long trial,ua,uasaved; + unsigned long trial,ua,uasaved = NIL; int ok; char tag[16]; char *lsterr = NIL, *base; diff --git a/imap/src/c-client/json.c b/imap/src/c-client/json.c index 973c8ff..1dd9c99 100644 --- a/imap/src/c-client/json.c +++ b/imap/src/c-client/json.c @@ -209,7 +209,7 @@ json_strchr(unsigned char *s, unsigned char c) void * json_value_parse(unsigned char **s, JObjType *jtype) { - void *rv; + void *rv = NIL; unsigned char *u, *w; unsigned long *l; diff --git a/imap/src/c-client/oauth2_aux.c b/imap/src/c-client/oauth2_aux.c index bb4ddbc..4ab538c 100644 --- a/imap/src/c-client/oauth2_aux.c +++ b/imap/src/c-client/oauth2_aux.c @@ -104,7 +104,7 @@ JSON_S *oauth2_json_reply(OAUTH2_SERVER_METHOD_S RefreshMethod, OAUTH2_S *oauth2 { JSON_S *json = NULL; HTTP_PARAM_S params[OAUTH2_PARAM_NUMBER]; - HTTPSTREAM *stream; + HTTPSTREAM *stream = NIL; unsigned char *s; char *server = NULL; diff --git a/imap/src/c-client/pop3.c b/imap/src/c-client/pop3.c index d91b3cc..89c3d9c 100644 --- a/imap/src/c-client/pop3.c +++ b/imap/src/c-client/pop3.c @@ -555,7 +555,7 @@ long pop3_capa (MAILSTREAM *stream,long flags) long pop3_auth (MAILSTREAM *stream,NETMBX *mb,char *pwd,char *usr) { - unsigned long i,trial,auths = 0, authsaved; + unsigned long i,trial,auths = 0, authsaved = NIL; char *t, *app_pwd = NIL, *base; AUTHENTICATOR *at, *atsaved; long ret = NIL; diff --git a/imap/src/c-client/smtp.c b/imap/src/c-client/smtp.c index 002e410..bee3456 100644 --- a/imap/src/c-client/smtp.c +++ b/imap/src/c-client/smtp.c @@ -281,7 +281,7 @@ SENDSTREAM *smtp_open_full (NETDRIVER *dv,char **hostlist,char *service, long smtp_auth (SENDSTREAM *stream,NETMBX *mb,char *tmp) { - unsigned long trial,auths, authsaved; + unsigned long trial,auths, authsaved = NIL; char *lsterr = NIL; char usr[MAILTMPLEN], *base; AUTHENTICATOR *at, *atsaved; diff --git a/imap/src/c-client/utf8.c b/imap/src/c-client/utf8.c index be03bd1..418f94d 100644 --- a/imap/src/c-client/utf8.c +++ b/imap/src/c-client/utf8.c @@ -2422,7 +2422,7 @@ RECURSIVEMORE { unsigned long ucs4_decompose (unsigned long c,void **more) { - unsigned long i,ix,ret; + unsigned long i,ix,ret = c; struct decomposemore *m; if (c & U8G_ERROR) { /* want to chase more? */ /* do sanity check */ diff --git a/imap/src/osdep/unix/dummy.c b/imap/src/osdep/unix/dummy.c index 244a13c..646f67e 100644 --- a/imap/src/osdep/unix/dummy.c +++ b/imap/src/osdep/unix/dummy.c @@ -519,7 +519,7 @@ long dummy_delete (MAILSTREAM *stream,char *mailbox) struct stat sbuf; char *s,tmp[MAILTMPLEN]; if (!(s = dummy_file (tmp,mailbox))) { - sprintf (tmp,"Can't delete - invalid name: %.80s",s); + sprintf (tmp,"Can't delete - invalid name: %.80s",mailbox); MM_LOG (tmp,ERROR); } /* no trailing / (workaround BSD kernel bug) */ diff --git a/imap/src/osdep/unix/tcp_unix.c b/imap/src/osdep/unix/tcp_unix.c index 6ddac4d..cf18bb6 100644 --- a/imap/src/osdep/unix/tcp_unix.c +++ b/imap/src/osdep/unix/tcp_unix.c @@ -988,7 +988,7 @@ char *tcp_canonical (char *name) char *tcp_name (struct sockaddr *sadr,long flag) { - char *ret,*t,adr[MAILTMPLEN],tmp[MAILTMPLEN],buf[NI_MAXHOST]; + char *ret,*t,adr[MAILTMPLEN],tmp[MAILTMPLEN+1],buf[NI_MAXHOST]; sprintf (ret = adr,"[%.80s]",ip_sockaddrtostring (sadr,buf)); if (allowreversedns) { blocknotify_t bn = (blocknotify_t)mail_parameters(NIL,GET_BLOCKNOTIFY,NIL); @@ -1002,7 +1002,8 @@ char *tcp_name (struct sockaddr *sadr,long flag) /* translate address to name */ if ((t = tcp_name_valid (ip_sockaddrtoname (sadr,buf))) != NULL) { /* produce verbose form if needed */ - if (flag) sprintf (ret = tmp,"%s %s",t,adr); + if (flag) sprintf (ret = tmp,"%.*s %.*s", (int) strlen(t), t, + MAILTMPLEN - (int)strlen(t) - 1,adr); else ret = t; } (*bn) (BLOCK_NONSENSITIVE,data); diff --git a/pith/pine.hlp b/pith/pine.hlp index 09c4d2d..075d1fd 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 573 2021-08-15 20:51:36 +Alpine Commit 574 2021-08-19 21:13:45 ============= h_news ================= -- 2.11.4.GIT