ctype.h: remove duplicate isdigit() helper
PATCH v2 1/1 ctype.h: remove duplicate isdigit() helper
From: Arnd Bergmann <[email protected]>
gcc warns a few thousand times about the isdigit() shadow:
include/linux/ctype.h:26:19: warning: declaration of 'isdigit' shadows a built-in function [-Wshadow]
As there is already a compiler builtin, just use that, and make it clear we do that by defining a macro. Unfortunately, clang does not have the isdigit() builtin, so this has to be conditional.
--- include/linux/compiler.h | 6 ++++++ include/linux/ctype.h | 15 +++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-)
include/linux/compiler.h +6 -0
@@ -136,6 +136,12 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val, } while (0)#endif +#ifdef __has_builtin +#define has_builtin (x) __has_builtin(x) +#else +#define has_builtin (x) (0) +#endif +/* * KENTRY - kernel entry point * This can be used to annotate symbols (functions or data) that are used
include/linux/ctype.h +11 -4
@@ -2,6 +2,8 @@#ifndef _LINUX_CTYPE_H#define _LINUX_CTYPE_H +#include <linux/compiler.h> +/* * NOTE! This ctype does not handle EOF like the standard C * library is required to.
@@ -23,10 +25,6 @@ extern const unsigned char _ctype[];#define isalnum (c) ((__ismask(c)&(_U|_L|_D)) != 0)#define isalpha (c) ((__ismask(c)&(_U|_L)) != 0)#define iscntrl (c) ((__ismask(c)&(_C)) != 0) -static inline int isdigit (int c) -{ -return '0' <= c && c <='9' ; -}#define isgraph (c) ((__ismask(c)&(_P|_U|_L|_D)) != 0)#define islower (c) ((__ismask(c)&(_L)) != 0)#define isprint (c) ((__ismask(c)&(_P|_U|_L|_D|_SP)) != 0)
@@ -39,6 +37,15 @@ static inline int isdigit(int c)#define isascii (c) (((unsigned char)(c))<=0x7f)#define toascii (c) (((unsigned char)(c))&0x7f) +#if has_builtin (__builtin_isdigit) +#define isdigit (c) __builtin_isdigit(c) +#else +static inline int isdigit (int c) +{ +return '0' <= c && c <='9' ; +} +#endif +static inline unsigned char __tolower (unsigned char c) {if (isupper (c))
Signature · 1 line
2.27.0
include/linux/compiler.h void ftrace_likely_update(struct ftrace_likely_data *f, int val, · line 143
Quoted 6 lines · Arnd Bergmann
include/linux/compiler.h +5
-0+#ifdef __has_builtin +#define has_builtin (x) __has_builtin(x) +#else +#define has_builtin (x) (0) +#endif
Could this be
#ifndef __has_builtin
# define __has_builtin(x) 0
#endif? i.e. mimicking what we do for __has_attribute.
It would also be a nice idea to put a reminder comment like:
/*
* __has_builtin is supported on gcc >= 10, clang >= 3 and icc >= 21.
* In the meantime, to support gcc < 10, we implement __has_builtin
* by hand.
*/
Cheers,
Miguel
Quoted 11 lines · Miguel Ojeda
include/linux/compiler.h void ftrace_likely_update(struct ftrace_likely_data *f, int val, · line 143
Quoted 6 lines · Arnd Bergmann
include/linux/compiler.h +5
-0+#ifdef __has_builtin +#define has_builtin (x) __has_builtin(x) +#else +#define has_builtin (x) (0) +#endif Could this be
Quoted 5 lines
#ifndef __has_builtin # define __has_builtin(x) 0 #endif? i.e. mimicking what we do for
__has_attribute.
Ah, I didn't know about that
Quoted 7 lines
It would also be a nice idea to put a reminder comment like:
/*
*__has_builtinis supported on gcc >= 10, clang >= 3 and icc >= 21.
* In the meantime, to support gcc < 10, we implement__has_builtin
* by hand.
*/
Sounds good, I'll take that. Are the clang and icc version numbers the actual ones we should list here, or is this just an example?
Arnd
Quoted 3 lines · Arnd Bergmann
Sounds good, I'll take that. Are the clang and icc version numbers the actual ones we should list here, or is this just an example?
Actual ones -- well, the best approximation I could get from the available versions in Compiler Explorer :-)
Cheers,
Miguel