summaryrefslogtreecommitdiff
path: root/poptparse.c
diff options
context:
space:
mode:
authorjbj <jbj>2008-02-16 20:57:38 +0000
committerjbj <jbj>2008-02-16 20:57:38 +0000
commitf66417cc1f4b12807bf8c26a3b06a649a5a0f3c6 (patch)
tree875959f438b6dcf3a3211dd70fc08ea970458e4f /poptparse.c
parentf315bda6f0f4e29c4edcb44936f6d19ee2ecdba5 (diff)
downloadlibpopt-f66417cc1f4b12807bf8c26a3b06a649a5a0f3c6.tar.gz
- splint fiddles.
Diffstat (limited to 'poptparse.c')
-rw-r--r--poptparse.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/poptparse.c b/poptparse.c
index f577a02..eaf8427 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -61,7 +61,7 @@ int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
int rc = POPT_ERROR_MALLOC;
if (argv == NULL) return rc;
- buf = bufOrig = calloc(1, buflen);
+ buf = bufOrig = calloc((size_t)1, buflen);
if (buf == NULL) {
free(argv);
return rc;
@@ -180,7 +180,7 @@ int poptConfigFileToString(FILE *fp, char ** argstrp, /*@unused@*/ int flags)
if (*q == '\0') {
/* single command line option (ie, no name=val, just name) */
q[-1] = '\0'; /* kill off newline from fgets() call */
- argvlen += (t = q - p) + (sizeof(" --")-1);
+ argvlen += (t = (size_t)(q - p)) + (sizeof(" --")-1);
if (argvlen >= maxargvlen) {
maxargvlen = (t > maxargvlen) ? t*2 : maxargvlen*2;
argstr = realloc(argstr, maxargvlen);
@@ -208,7 +208,7 @@ int poptConfigFileToString(FILE *fp, char ** argstrp, /*@unused@*/ int flags)
*x = '\0'; /* null out last char if space (including fgets() NL) */
/* rest of line accept */
- t = x - p;
+ t = (size_t)(x - p);
argvlen += t + (sizeof("' --='")-1);
if (argvlen >= maxargvlen) {
maxargvlen = (t > maxargvlen) ? t*2 : maxargvlen*2;