X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/bc93ee842fd5dd2a1cc2b2cb25656a98c673d772..121bfb2b4d9df88bfbc9917209842bb8d9d17e22:/popt/popthelp.c

diff --git a/popt/popthelp.c b/popt/popthelp.c
index eb735ffb..ba8d0243 100644
--- a/popt/popthelp.c
+++ b/popt/popthelp.c
@@ -10,7 +10,7 @@
 
 #include "system.h"
 
-#define	POPT_WCHAR_HACK
+/*#define POPT_WCHAR_HACK*/
 #ifdef 	POPT_WCHAR_HACK
 #include <wchar.h>			/* for mbsrtowcs */
 /*@access mbstate_t @*/
@@ -360,7 +360,7 @@ static void singleOptionHelp(FILE * fp, size_t maxLeftCol,
 /*@=boundswrite@*/
 
     if (help)
-	fprintf(fp,"  %-*s   ", maxLeftCol+displaypad, left);
+	fprintf(fp,"  %-*s   ", (int)maxLeftCol+displaypad, left);
     else {
 	fprintf(fp,"  %s\n", left); 
 	goto out;
@@ -381,9 +381,9 @@ static void singleOptionHelp(FILE * fp, size_t maxLeftCol,
 	char format[16];
 
 	ch = help + lineLength - 1;
-	while (ch > help && !isspace(*ch)) ch--;
+	while (ch > help && !isSpace(ch)) ch--;
 	if (ch == help) break;		/* give up */
-	while (ch > (help + 1) && isspace(*ch)) ch--;
+	while (ch > (help + 1) && isSpace(ch)) ch--;
 	ch++;
 
 	snprintf(format, sizeof format, "%%.%ds\n%%%ds", (int) (ch - help), (int) indentLength);
@@ -391,7 +391,7 @@ static void singleOptionHelp(FILE * fp, size_t maxLeftCol,
 	fprintf(fp, format, help, " ");
 	/*@=formatconst@*/
 	help = ch;
-	while (isspace(*help) && *help) help++;
+	while (isSpace(help) && *help) help++;
 	helpLength = strlen(help);
     }
 /*@=boundsread@*/