undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nk/ctype-for-perf' into maint

Browse Source 
* nk/ctype-for-perf:
  ctype: implement islower/isupper macro
  ctype.c only wants git-compat-util.h
This commit is contained in:
Junio C Hamano 2012-02-16 14:00:16 -08:00
commit f342afafce
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctype.c
View File

@ -3,7 +3,7 @@
* *
* No surprises, and works with signed and unsigned chars. * No surprises, and works with signed and unsigned chars.
*/ */
#include "cache.h" #include "git-compat-util.h"
enum { enum {
S = GIT_SPACE, S = GIT_SPACE,

15
git-compat-util.h
View File

@ -463,6 +463,8 @@ static inline int has_extension(const char *filename, const char *ext)
#undef isdigit #undef isdigit
#undef isalpha #undef isalpha
#undef isalnum #undef isalnum
#undef islower
#undef isupper
#undef tolower #undef tolower
#undef toupper #undef toupper
extern unsigned char sane_ctype[256]; extern unsigned char sane_ctype[256];
@ -478,6 +480,8 @@ extern unsigned char sane_ctype[256];
#define isdigit(x) sane_istest(x,GIT_DIGIT) #define isdigit(x) sane_istest(x,GIT_DIGIT)
#define isalpha(x) sane_istest(x,GIT_ALPHA) #define isalpha(x) sane_istest(x,GIT_ALPHA)
#define isalnum(x) sane_istest(x,GIT_ALPHA | GIT_DIGIT) #define isalnum(x) sane_istest(x,GIT_ALPHA | GIT_DIGIT)
#define islower(x) sane_iscase(x, 1)
#define isupper(x) sane_iscase(x, 0)
#define is_glob_special(x) sane_istest(x,GIT_GLOB_SPECIAL) #define is_glob_special(x) sane_istest(x,GIT_GLOB_SPECIAL)
#define is_regex_special(x) sane_istest(x,GIT_GLOB_SPECIAL | GIT_REGEX_SPECIAL) #define is_regex_special(x) sane_istest(x,GIT_GLOB_SPECIAL | GIT_REGEX_SPECIAL)
#define tolower(x) sane_case((unsigned char)(x), 0x20) #define tolower(x) sane_case((unsigned char)(x), 0x20)
@ -491,6 +495,17 @@ static inline int sane_case(int x, int high)
return x; return x;
} }
static inline int sane_iscase(int x, int is_lower)
{
if (!sane_istest(x, GIT_ALPHA))
return 0;
if (is_lower)
return (x & 0x20) != 0;
else
return (x & 0x20) == 0;
}
static inline int strtoul_ui(char const *s, int base, unsigned int *result) static inline int strtoul_ui(char const *s, int base, unsigned int *result)
{ {
unsigned long ul; unsigned long ul;