From: Masahiro Yamada <masahiroy@kernel.org>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Masahiro Yamada" <masahiroy@kernel.org>
Subject: [PATCH 2/5] wildmatch: remove IS*() macros
Date: Fri, 10 Feb 2023 16:59:36 +0900 [thread overview]
Message-ID: <20230210075939.44949-3-masahiroy@kernel.org> (raw)
In-Reply-To: <20230210075939.44949-1-masahiroy@kernel.org>
This file was imported from rsync, which has some compatibility
layer because it relies on <ctypes.h> in C standard library.
In contrast, GIT has its own implementations in git-compat-util.h.
[1] isprint, isgraph
They check the given char range in an obvious way
[2] isspace, isblank, isdigit, isalpha, isalnum, islower, isupper,
iscntr, ispunct
They look up sane_ctype[], which fills the range 0x80-0xff with 0.
[3] isxdigit
It looks up hexval_table[], which fills the range 0x80-0xff with -1.
For all of these, ISACII() is a redundant check.
Remove IS*() macros, and directly use is*() in dowild().
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
wildmatch.c | 55 ++++++++++++++++++-----------------------------------
1 file changed, 18 insertions(+), 37 deletions(-)
diff --git a/wildmatch.c b/wildmatch.c
index 85c4c7f8a7..a510b3fd23 100644
--- a/wildmatch.c
+++ b/wildmatch.c
@@ -22,25 +22,6 @@ typedef unsigned char uchar;
&& *(class) == *(litmatch) \
&& strncmp((char*)class, litmatch, len) == 0)
-#if defined STDC_HEADERS || !defined isascii
-# define ISASCII(c) 1
-#else
-# define ISASCII(c) isascii(c)
-#endif
-
-#define ISBLANK(c) (ISASCII(c) && isblank(c))
-#define ISGRAPH(c) (ISASCII(c) && isgraph(c))
-#define ISPRINT(c) (ISASCII(c) && isprint(c))
-#define ISDIGIT(c) (ISASCII(c) && isdigit(c))
-#define ISALNUM(c) (ISASCII(c) && isalnum(c))
-#define ISALPHA(c) (ISASCII(c) && isalpha(c))
-#define ISCNTRL(c) (ISASCII(c) && iscntrl(c))
-#define ISLOWER(c) (ISASCII(c) && islower(c))
-#define ISPUNCT(c) (ISASCII(c) && ispunct(c))
-#define ISSPACE(c) (ISASCII(c) && isspace(c))
-#define ISUPPER(c) (ISASCII(c) && isupper(c))
-#define ISXDIGIT(c) (ISASCII(c) && isxdigit(c))
-
/* Match pattern "p" against "text" */
static int dowild(const uchar *p, const uchar *text, unsigned int flags)
{
@@ -52,9 +33,9 @@ static int dowild(const uchar *p, const uchar *text, unsigned int flags)
uchar t_ch, prev_ch;
if ((t_ch = *text) == '\0' && p_ch != '*')
return WM_ABORT_ALL;
- if ((flags & WM_CASEFOLD) && ISUPPER(t_ch))
+ if ((flags & WM_CASEFOLD) && isupper(t_ch))
t_ch = tolower(t_ch);
- if ((flags & WM_CASEFOLD) && ISUPPER(p_ch))
+ if ((flags & WM_CASEFOLD) && isupper(p_ch))
p_ch = tolower(p_ch);
switch (p_ch) {
case '\\':
@@ -133,11 +114,11 @@ static int dowild(const uchar *p, const uchar *text, unsigned int flags)
*/
if (!is_glob_special(*p)) {
p_ch = *p;
- if ((flags & WM_CASEFOLD) && ISUPPER(p_ch))
+ if ((flags & WM_CASEFOLD) && isupper(p_ch))
p_ch = tolower(p_ch);
while ((t_ch = *text) != '\0' &&
(match_slash || t_ch != '/')) {
- if ((flags & WM_CASEFOLD) && ISUPPER(t_ch))
+ if ((flags & WM_CASEFOLD) && isupper(t_ch))
t_ch = tolower(t_ch);
if (t_ch == p_ch)
break;
@@ -186,7 +167,7 @@ static int dowild(const uchar *p, const uchar *text, unsigned int flags)
}
if (t_ch <= p_ch && t_ch >= prev_ch)
matched = 1;
- else if ((flags & WM_CASEFOLD) && ISLOWER(t_ch)) {
+ else if ((flags & WM_CASEFOLD) && islower(t_ch)) {
uchar t_ch_upper = toupper(t_ch);
if (t_ch_upper <= p_ch && t_ch_upper >= prev_ch)
matched = 1;
@@ -208,42 +189,42 @@ static int dowild(const uchar *p, const uchar *text, unsigned int flags)
continue;
}
if (CC_EQ(s,i, "alnum")) {
- if (ISALNUM(t_ch))
+ if (isalnum(t_ch))
matched = 1;
} else if (CC_EQ(s,i, "alpha")) {
- if (ISALPHA(t_ch))
+ if (isalpha(t_ch))
matched = 1;
} else if (CC_EQ(s,i, "blank")) {
- if (ISBLANK(t_ch))
+ if (isblank(t_ch))
matched = 1;
} else if (CC_EQ(s,i, "cntrl")) {
- if (ISCNTRL(t_ch))
+ if (iscntrl(t_ch))
matched = 1;
} else if (CC_EQ(s,i, "digit")) {
- if (ISDIGIT(t_ch))
+ if (isdigit(t_ch))
matched = 1;
} else if (CC_EQ(s,i, "graph")) {
- if (ISGRAPH(t_ch))
+ if (isgraph(t_ch))
matched = 1;
} else if (CC_EQ(s,i, "lower")) {
- if (ISLOWER(t_ch))
+ if (islower(t_ch))
matched = 1;
} else if (CC_EQ(s,i, "print")) {
- if (ISPRINT(t_ch))
+ if (isprint(t_ch))
matched = 1;
} else if (CC_EQ(s,i, "punct")) {
- if (ISPUNCT(t_ch))
+ if (ispunct(t_ch))
matched = 1;
} else if (CC_EQ(s,i, "space")) {
- if (ISSPACE(t_ch))
+ if (isspace(t_ch))
matched = 1;
} else if (CC_EQ(s,i, "upper")) {
- if (ISUPPER(t_ch))
+ if (isupper(t_ch))
matched = 1;
- else if ((flags & WM_CASEFOLD) && ISLOWER(t_ch))
+ else if ((flags & WM_CASEFOLD) && islower(t_ch))
matched = 1;
} else if (CC_EQ(s,i, "xdigit")) {
- if (ISXDIGIT(t_ch))
+ if (isxdigit(t_ch))
matched = 1;
} else /* malformed [:class:] string */
return WM_ABORT_ALL;
--
2.34.1
next prev parent reply other threads:[~2023-02-10 8:00 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-10 7:59 [PATCH 0/5] Clean up wildmatch.c Masahiro Yamada
2023-02-10 7:59 ` [PATCH 1/5] git-compat-util: add isblank() and isgraph() Masahiro Yamada
2023-02-10 13:16 ` Ævar Arnfjörð Bjarmason
2023-02-10 16:56 ` Masahiro Yamada
2023-02-10 19:10 ` Junio C Hamano
2023-02-10 19:25 ` Masahiro Yamada
2023-02-10 22:03 ` René Scharfe
2023-02-11 7:01 ` Masahiro Yamada
2023-02-11 13:48 ` René Scharfe
2023-02-11 14:11 ` René Scharfe
2023-02-10 7:59 ` Masahiro Yamada [this message]
2023-02-10 7:59 ` [PATCH 3/5] wildmatch: remove NEGATE_CLASS and NEGATE_CLASS2 macros Masahiro Yamada
2023-02-10 13:11 ` Ævar Arnfjörð Bjarmason
2023-02-10 17:03 ` Masahiro Yamada
2023-02-10 7:59 ` [PATCH 4/5] wildmatch: use char instead of uchar Masahiro Yamada
2023-02-10 13:09 ` Ævar Arnfjörð Bjarmason
2023-02-10 7:59 ` [PATCH 5/5] wildmatch: more cleanups after killing uchar Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230210075939.44949-3-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).