diff options
| -rw-r--r-- | alpine/roleconf.c | 2 | ||||
| -rw-r--r-- | imap/src/imapd/imapd.c | 2 | ||||
| -rw-r--r-- | pith/pine.hlp | 2 | ||||
| -rw-r--r-- | pith/smkeys.c | 2 | ||||
| -rw-r--r-- | pith/string.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/alpine/roleconf.c b/alpine/roleconf.c index 249e97a0..ef785a71 100644 --- a/alpine/roleconf.c +++ b/alpine/roleconf.c @@ -6429,7 +6429,7 @@ check_role_folders(char **lst, unsigned int action) } } else{ /* blank item in list of folders */ - if(action && lst[i+1] == '\0') + if(action && lst[i+1] == NULL) q_status_message(SM_ORDER,3,5,_("Set a valid Filter Action before Exiting")); else /* !action && lst[i+1] == '\0' */ q_status_message(SM_ORDER,3,5,_("Set a valid Specific Folder before Exiting")); diff --git a/imap/src/imapd/imapd.c b/imap/src/imapd/imapd.c index 980eadec..1c1d4011 100644 --- a/imap/src/imapd/imapd.c +++ b/imap/src/imapd/imapd.c @@ -2333,7 +2333,7 @@ STRINGLIST *parse_stringlist (unsigned char **s,int *list) /* must be end of list */ if (c != ')') mail_free_stringlist (&ret); } - if ((t = *s) != '\0') { /* need to reload strtok state? */ + if ((t = *s) != NULL) { /* need to reload strtok state? */ /* end of a list? */ if (*list && (*t == ')') && !t[1]) *list = NIL; else sstate = t; /* otherwise reset strtok state to s */ diff --git a/pith/pine.hlp b/pith/pine.hlp index 2d436fdc..f02b58f1 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 212 2017-07-14 08:25:45 +Alpine Commit 213 2017-07-18 19:03:59 ============= h_news ================= <HTML> <HEAD> diff --git a/pith/smkeys.c b/pith/smkeys.c index d899f4f8..ea4b551e 100644 --- a/pith/smkeys.c +++ b/pith/smkeys.c @@ -721,7 +721,7 @@ add_certs_in_dir(X509_LOOKUP *lookup, char *path, char *ext, CertList **cdata) } /* if all certificates fail to load */ - if(nerr == nfiles) ret = -1; + if(nerr > 0 && nerr == nfiles) ret = -1; return ret; } diff --git a/pith/string.c b/pith/string.c index 59506670..533fe28a 100644 --- a/pith/string.c +++ b/pith/string.c @@ -1930,7 +1930,7 @@ get_pair(char *string, char **label, char **value, int firstws, int strip_intern *p = '\0'; /* tie off label */ fs_give((void **)&tmp); - if(*label == '\0') + if(*label == NULL) fs_give((void **)label); } else |