X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/25f637a334a39448d0ffcdcf20d9917472db8d97..45760f5f05cabf5e543c58a3faa349a36229d8db:/log.c

diff --git a/log.c b/log.c
index 9824de74..3da7b9fa 100644
--- a/log.c
+++ b/log.c
@@ -214,11 +214,11 @@ static void filtered_fwrite(FILE *f, const char *buf, int len, int use_isprint)
 	for (s = buf; s < end; s++) {
 		if ((s < end - 4
 		  && *s == '\\' && s[1] == '#'
-		  && isdigit(*(uchar*)(s+2))
-		  && isdigit(*(uchar*)(s+3))
-		  && isdigit(*(uchar*)(s+4)))
+		  && isDigit(s + 2)
+		  && isDigit(s + 3)
+		  && isDigit(s + 4))
 		 || (*s != '\t'
-		  && ((use_isprint && !isprint(*(uchar*)s))
+		  && ((use_isprint && !isPrint(s))
 		   || *(uchar*)s < ' '))) {
 			if (s != buf && fwrite(buf, s - buf, 1, f) != 1)
 				exit_cleanup(RERR_MESSAGEIO);
@@ -445,7 +445,7 @@ static void log_formatted(enum logcode code, char *format, char *op,
 		n = fmt + 1;
 		if (*p == '-')
 			*n++ = *p++;
-		while (isdigit(*(uchar*)p) && n - fmt < (int)(sizeof fmt) - 8)
+		while (isDigit(p) && n - fmt < (int)(sizeof fmt) - 8)
 			*n++ = *p++;
 		if (!*p)
 			break;
@@ -614,8 +614,7 @@ static void log_formatted(enum logcode code, char *format, char *op,
 				int i;
 				for (i = 2; n[i]; i++)
 					n[i] = ch;
-			} else if (n[0] == '.' || n[0] == 'h'
-			        || (n[0] == 'c' && n[1] == 'f')) {
+			} else if (n[0] == '.' || n[0] == 'h' || n[0] == 'c') {
 				int i;
 				for (i = 2; n[i]; i++) {
 					if (n[i] != '.')
@@ -677,7 +676,7 @@ int log_format_has(const char *format, char esc)
 	for (p = format; (p = strchr(p, '%')) != NULL; ) {
 		if (*++p == '-')
 			p++;
-		while (isdigit(*(uchar*)p))
+		while (isDigit(p))
 			p++;
 		if (!*p)
 			break;