aboutsummaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-12 22:41:56 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-12 22:41:56 -0800
commit39ee1710c071f42741d4324dbb03e4618917734c (patch)
treef89df258b5fbf274772da27331b0656e0f920f02 /git-compat-util.h
parent5cdc9fbb0894023da8e4dab552dfdda8b662feab (diff)
parent43ccdf56ec5c92478361a0eb94b91c535fd4d2bd (diff)
downloadgit-39ee1710c071f42741d4324dbb03e4618917734c.tar.gz
git-39ee1710c071f42741d4324dbb03e4618917734c.tar.xz
Merge branch 'nk/ctype-for-perf'
* nk/ctype-for-perf: ctype: implement islower/isupper macro ctype.c only wants git-compat-util.h
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 8f3972cd3..426ae43be 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -463,6 +463,8 @@ static inline int has_extension(const char *filename, const char *ext)
#undef isdigit
#undef isalpha
#undef isalnum
+#undef islower
+#undef isupper
#undef tolower
#undef toupper
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 isalpha(x) sane_istest(x,GIT_ALPHA)
#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_regex_special(x) sane_istest(x,GIT_GLOB_SPECIAL | GIT_REGEX_SPECIAL)
#define tolower(x) sane_case((unsigned char)(x), 0x20)
@@ -491,6 +495,17 @@ static inline int sane_case(int x, int high)
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)
{
unsigned long ul;