cleanup: add isascii()

René Scharfe · gitster · commit c2e9364a06df · 2009-03-07T11:22:42.000-08:00
Add a standard definition of isascii() and use it to replace an open
coded high-bit test in pretty.c.  While we're there, write the ESC
char as the more commonly used '\033' instead of as 0x1b to enhance
its grepability.

Signed-off-by: Rene Scharfe &lt;rene.scharfe@lsrfire.ath.cx&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/git-compat-util.h b/git-compat-util.h
@@ -319,6 +319,7 @@ static inline int has_extension(const char *filename, const char *ext)
 }
 
 /* Sane ctype - no locale, and works with signed chars */
+#undef isascii
 #undef isspace
 #undef isdigit
 #undef isalpha
@@ -332,6 +333,7 @@ extern unsigned char sane_ctype[256];
 #define GIT_GLOB_SPECIAL 0x08
 #define GIT_REGEX_SPECIAL 0x10
 #define sane_istest(x,mask) ((sane_ctype[(unsigned char)(x)] & (mask)) != 0)
+#define isascii(x) (((x) & ~0x7f) == 0)
 #define isspace(x) sane_istest(x,GIT_SPACE)
 #define isdigit(x) sane_istest(x,GIT_DIGIT)
 #define isalpha(x) sane_istest(x,GIT_ALPHA)
diff --git a/pretty.c b/pretty.c
@@ -75,8 +75,7 @@ static int get_one_line(const char *msg)
 /* High bit set, or ISO-2022-INT */
 int non_ascii(int ch)
 {
-	ch = (ch & 0xff);
-	return ((ch & 0x80) || (ch == 0x1b));
+	return !isascii(ch) || ch == '\033';
 }
 
 static int is_rfc2047_special(char ch)

Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,7 @@ static int get_one_line(const char *msg)`
`75`	`75`	`/* High bit set, or ISO-2022-INT */`
`76`	`76`	`int non_ascii(int ch)`
`77`	`77`	`{`
`78`		`- ch = (ch & 0xff);`
`79`		`- return ((ch & 0x80) \|\| (ch == 0x1b));`
	`78`	`+ return !isascii(ch) \|\| ch == '\033';`
`80`	`79`	`}`
`81`	`80`
`82`	`81`	`static int is_rfc2047_special(char ch)`