summaryrefslogtreecommitdiff
path: root/pith
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2017-07-18 19:04:03 -0600
committerEduardo Chappa <chappa@washington.edu>2017-07-18 19:04:03 -0600
commitb136a847c4acd743b0026c7dfd2069196520a260 (patch)
tree03650586533a5561aaaf3d1f8f4edd1d51c37660 /pith
parentbc3f61e54599136fb264cf4074abb685b866eb85 (diff)
downloadalpine-b136a847c4acd743b0026c7dfd2069196520a260.tar.xz
* Fix a few compiler warnings.
Diffstat (limited to 'pith')
-rw-r--r--pith/pine.hlp2
-rw-r--r--pith/smkeys.c2
-rw-r--r--pith/string.c2
3 files changed, 3 insertions, 3 deletions
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