A couple more unsigned char changes to silence compiler warnings

[rsync/rsync.git] / popt / poptconfig.c

diff --git a/popt/poptconfig.c b/popt/poptconfig.c
index 58ccf01..5023566 100644 (file)
--- a/popt/poptconfig.c
+++ b/popt/poptconfig.c
@@ -10,7 +10,7 @@
 #include "poptint.h"
 
 /*@-compmempass@*/     /* FIX: item->option.longName kept, not dependent. */
-static void configLine(poptContext con, char * line)
+static void configLine(poptContext con, unsigned char * line)
        /*@modifies con @*/
 {
     /*@-type@*/
@@ -18,7 +18,7 @@ static void configLine(poptContext con, char * line)
     /*@=type@*/
     const char * entryType;
     const char * opt;
-    poptItem item = alloca(sizeof(*item));
+    poptItem item = (poptItem) alloca(sizeof(*item));
     int i, j;
     
     memset(item, 0, sizeof(*item));
@@ -92,9 +92,9 @@ static void configLine(poptContext con, char * line)
 
 int poptReadConfigFile(poptContext con, const char * fn)
 {
-    const char * file, * chptr, * end;
-    char * buf;
-/*@dependent@*/ char * dst;
+    const unsigned char * file, * chptr, * end;
+    unsigned char * buf;
+/*@dependent@*/ unsigned char * dst;
     int fd, rc;
     off_t fileLength;
 
@@ -159,7 +159,8 @@ int poptReadConfigFile(poptContext con, const char * fn)
     return 0;
 }
 
-int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv) {
+int poptReadDefaultConfig(poptContext con, /*@unused@*/ UNUSED(int useEnv))
+{
     char * fn, * home;
     int rc;