Cosmetic - remove unneded brackets and #undef

2 files changed, 40 insertions, 41 deletions

diff --git a/lib/libc/locale/isctype.c b/lib/libc/locale/isctype.c
index 12574f9e0e04..d25772bec279 100644
--- a/lib/libc/locale/isctype.c
+++ b/lib/libc/locale/isctype.c
@@ -52,7 +52,7 @@ int
 digittoint(c)
 	int c;
 {
-	return (__maskrune((c), 0xFF));
+	return (__maskrune(c, 0xFF));
 }
 
 #undef isalnum
@@ -60,7 +60,7 @@ int
 isalnum(c)
 	int c;
 {
-	return (__istype((c), _CTYPE_A|_CTYPE_D));
+	return (__istype(c, _CTYPE_A|_CTYPE_D));
 }
 
 #undef isalpha
@@ -68,7 +68,7 @@ int
 isalpha(c)
 	int c;
 {
-	return (__istype((c), _CTYPE_A));
+	return (__istype(c, _CTYPE_A));
 }
 
 #undef isascii
@@ -76,7 +76,7 @@ int
 isascii(c)
 	int c;
 {
-	return (((c) & ~0x7F) == 0);
+	return ((c & ~0x7F) == 0);
 }
 
 #undef isblank
@@ -84,7 +84,7 @@ int
 isblank(c)
 	int c;
 {
-	return (__istype((c), _CTYPE_B));
+	return (__istype(c, _CTYPE_B));
 }
 
 #undef iscntrl
@@ -92,7 +92,7 @@ int
 iscntrl(c)
 	int c;
 {
-	return (__istype((c), _CTYPE_C));
+	return (__istype(c, _CTYPE_C));
 }
 
 #undef isdigit
@@ -100,7 +100,7 @@ int
 isdigit(c)
 	int c;
 {
-	return (__isctype((c), _CTYPE_D));
+	return (__isctype(c, _CTYPE_D));
 }
 
 #undef isgraph
@@ -108,7 +108,7 @@ int
 isgraph(c)
 	int c;
 {
-	return (__istype((c), _CTYPE_G));
+	return (__istype(c, _CTYPE_G));
 }
 
 #undef ishexnumber 
@@ -116,7 +116,7 @@ int
 ishexnumber(c)
 	int c;
 {
-	return (__istype((c), _CTYPE_X));
+	return (__istype(c, _CTYPE_X));
 }
 
 #undef isideogram
@@ -124,7 +124,7 @@ int
 isideogram(c)
 	int c;
 {
-	return (__istype((c), _CTYPE_I));
+	return (__istype(c, _CTYPE_I));
 }
 
 #undef islower
@@ -132,7 +132,7 @@ int
 islower(c)
 	int c;
 {
-	return (__istype((c), _CTYPE_L));
+	return (__istype(c, _CTYPE_L));
 }
 
 #undef isnumber
@@ -140,7 +140,7 @@ int
 isnumber(c)
 	int c;
 {
-	return (__istype((c), _CTYPE_D));
+	return (__istype(c, _CTYPE_D));
 }
 
 #undef isphonogram	
@@ -148,7 +148,7 @@ int
 isphonogram(c)
 	int c;
 {
-	return (__istype((c), _CTYPE_Q));
+	return (__istype(c, _CTYPE_Q));
 }
 
 #undef isprint
@@ -156,7 +156,7 @@ int
 isprint(c)
 	int c;
 {
-	return (__istype((c), _CTYPE_R));
+	return (__istype(c, _CTYPE_R));
 }
 
 #undef ispunct
@@ -164,7 +164,7 @@ int
 ispunct(c)
 	int c;
 {
-	return (__istype((c), _CTYPE_P));
+	return (__istype(c, _CTYPE_P));
 }
 
 #undef isrune
@@ -172,7 +172,7 @@ int
 isrune(c)
 	int c;
 {
-	return (__istype((c), 0xFFFFFF00L));
+	return (__istype(c, 0xFFFFFF00L));
 }
 
 #undef isspace
@@ -180,7 +180,7 @@ int
 isspace(c)
 	int c;
 {
-	return (__istype((c), _CTYPE_S));
+	return (__istype(c, _CTYPE_S));
 }
 
 #undef isspecial
@@ -188,7 +188,7 @@ int
 isspecial(c)
 	int c;
 {
-	return (__istype((c), _CTYPE_T));
+	return (__istype(c, _CTYPE_T));
 }
 
 #undef isupper
@@ -196,7 +196,7 @@ int
 isupper(c)
 	int c;
 {
-	return (__istype((c), _CTYPE_U));
+	return (__istype(c, _CTYPE_U));
 }
 
 #undef isxdigit
@@ -204,7 +204,7 @@ int
 isxdigit(c)
 	int c;
 {
-	return (__isctype((c), _CTYPE_X));
+	return (__isctype(c, _CTYPE_X));
 }
 
 #undef toascii
@@ -212,7 +212,7 @@ int
 toascii(c)
 	int c;
 {
-	return ((c) & 0x7F);
+	return (c & 0x7F);
 }
 
 #undef tolower
diff --git a/lib/libc/locale/iswctype.c b/lib/libc/locale/iswctype.c
index bc0632baa499..031403797f25 100644
--- a/lib/libc/locale/iswctype.c
+++ b/lib/libc/locale/iswctype.c
@@ -49,7 +49,7 @@ int
 iswalnum(wc)
 	wint_t wc;
 {
-	return (__istype((wc), _CTYPE_A|_CTYPE_D));
+	return (__istype(wc, _CTYPE_A|_CTYPE_D));
 }
 
 #undef iswalpha
@@ -57,7 +57,7 @@ int
 iswalpha(wc)
 	wint_t wc;
 {
-	return (__istype((wc), _CTYPE_A));
+	return (__istype(wc, _CTYPE_A));
 }
 
 #undef iswascii
@@ -65,7 +65,7 @@ int
 iswascii(wc)
 	wint_t wc;
 {
-	return (((wc) & ~0x7F) == 0);
+	return ((wc & ~0x7F) == 0);
 }
 
 #undef iswblank
@@ -73,7 +73,7 @@ int
 iswblank(wc)
 	wint_t wc;
 {
-	return (__istype((wc), _CTYPE_B));
+	return (__istype(wc, _CTYPE_B));
 }
 
 #undef iswcntrl
@@ -81,7 +81,7 @@ int
 iswcntrl(wc)
 	wint_t wc;
 {
-	return (__istype((wc), _CTYPE_C));
+	return (__istype(wc, _CTYPE_C));
 }
 
 #undef iswdigit
@@ -89,7 +89,7 @@ int
 iswdigit(wc)
 	wint_t wc;
 {
-	return (__isctype((wc), _CTYPE_D));
+	return (__isctype(wc, _CTYPE_D));
 }
 
 #undef iswgraph
@@ -97,7 +97,7 @@ int
 iswgraph(wc)
 	wint_t wc;
 {
-	return (__istype((wc), _CTYPE_G));
+	return (__istype(wc, _CTYPE_G));
 }
 
 #undef iswhexnumber 
@@ -105,7 +105,7 @@ int
 iswhexnumber(wc)
 	wint_t wc;
 {
-	return (__istype((wc), _CTYPE_X));
+	return (__istype(wc, _CTYPE_X));
 }
 
 #undef iswideogram
@@ -113,7 +113,7 @@ int
 iswideogram(wc)
 	wint_t wc;
 {
-	return (__istype((wc), _CTYPE_I));
+	return (__istype(wc, _CTYPE_I));
 }
 
 #undef iswlower
@@ -121,7 +121,7 @@ int
 iswlower(wc)
 	wint_t wc;
 {
-	return (__istype((wc), _CTYPE_L));
+	return (__istype(wc, _CTYPE_L));
 }
 
 #undef iswnumber
@@ -129,7 +129,7 @@ int
 iswnumber(wc)
 	wint_t wc;
 {
-	return (__istype((wc), _CTYPE_D));
+	return (__istype(wc, _CTYPE_D));
 }
 
 #undef iswphonogram	
@@ -137,7 +137,7 @@ int
 iswphonogram(wc)
 	wint_t wc;
 {
-	return (__istype((wc), _CTYPE_Q));
+	return (__istype(wc, _CTYPE_Q));
 }
 
 #undef iswprint
@@ -145,7 +145,7 @@ int
 iswprint(wc)
 	wint_t wc;
 {
-	return (__istype((wc), _CTYPE_R));
+	return (__istype(wc, _CTYPE_R));
 }
 
 #undef iswpunct
@@ -153,7 +153,7 @@ int
 iswpunct(wc)
 	wint_t wc;
 {
-	return (__istype((wc), _CTYPE_P));
+	return (__istype(wc, _CTYPE_P));
 }
 
 #undef iswrune
@@ -161,7 +161,7 @@ int
 iswrune(wc)
 	wint_t wc;
 {
-	return (__istype((wc), 0xFFFFFF00L));
+	return (__istype(wc, 0xFFFFFF00L));
 }
 
 #undef iswspace
@@ -169,7 +169,7 @@ int
 iswspace(wc)
 	wint_t wc;
 {
-	return (__istype((wc), _CTYPE_S));
+	return (__istype(wc, _CTYPE_S));
 }
 
 #undef iswspecial
@@ -177,7 +177,7 @@ int
 iswspecial(wc)
 	wint_t wc;
 {
-	return (__istype((wc), _CTYPE_T));
+	return (__istype(wc, _CTYPE_T));
 }
 
 #undef iswupper
@@ -185,7 +185,7 @@ int
 iswupper(wc)
 	wint_t wc;
 {
-	return (__istype((wc), _CTYPE_U));
+	return (__istype(wc, _CTYPE_U));
 }
 
 #undef iswxdigit
@@ -193,7 +193,7 @@ int
 iswxdigit(wc)
 	wint_t wc;
 {
-	return (__isctype((wc), _CTYPE_X));
+	return (__isctype(wc, _CTYPE_X));
 }
 
 #undef towlower
@@ -212,7 +212,6 @@ towupper(wc)
         return (__toupper(wc));
 }
 
-#undef wcwidth
 int
 wcwidth(wc)
         wchar_t wc;