Merge branch 'rs/micro-cleanups'
Code cleanup. * rs/micro-cleanups: use strpbrk(3) to search for characters from a given set quote: use isalnum() to check for alphanumeric characters
This commit is contained in:
commit
ff41848e99
@ -536,7 +536,7 @@ static void append_one_rev(const char *av)
|
||||
append_ref(av, &revkey, 0);
|
||||
return;
|
||||
}
|
||||
if (strchr(av, '*') || strchr(av, '?') || strchr(av, '[')) {
|
||||
if (strpbrk(av, "*?[")) {
|
||||
/* glob style match */
|
||||
int saved_matches = ref_name_cnt;
|
||||
|
||||
|
@ -1245,7 +1245,7 @@ static char *path_lookup(const char *cmd, int exe_only)
|
||||
int len = strlen(cmd);
|
||||
int isexe = len >= 4 && !strcasecmp(cmd+len-4, ".exe");
|
||||
|
||||
if (strchr(cmd, '/') || strchr(cmd, '\\'))
|
||||
if (strpbrk(cmd, "/\\"))
|
||||
return xstrdup(cmd);
|
||||
|
||||
path = mingw_getenv("PATH");
|
||||
|
@ -19,8 +19,7 @@ static void cleanup_space(struct strbuf *sb)
|
||||
static void get_sane_name(struct strbuf *out, struct strbuf *name, struct strbuf *email)
|
||||
{
|
||||
struct strbuf *src = name;
|
||||
if (name->len < 3 || 60 < name->len || strchr(name->buf, '@') ||
|
||||
strchr(name->buf, '<') || strchr(name->buf, '>'))
|
||||
if (name->len < 3 || 60 < name->len || strpbrk(name->buf, "@<>"))
|
||||
src = email;
|
||||
else if (name == out)
|
||||
return;
|
||||
|
2
quote.c
2
quote.c
@ -55,7 +55,7 @@ void sq_quote_buf_pretty(struct strbuf *dst, const char *src)
|
||||
}
|
||||
|
||||
for (p = src; *p; p++) {
|
||||
if (!isalpha(*p) && !isdigit(*p) && !strchr(ok_punct, *p)) {
|
||||
if (!isalnum(*p) && !strchr(ok_punct, *p)) {
|
||||
sq_quote_buf(dst, src);
|
||||
return;
|
||||
}
|
||||
|
@ -19,7 +19,7 @@ int cmd__windows_named_pipe(int argc, const char **argv)
|
||||
if (argc < 2)
|
||||
goto print_usage;
|
||||
filename = argv[1];
|
||||
if (strchr(filename, '/') || strchr(filename, '\\'))
|
||||
if (strpbrk(filename, "/\\"))
|
||||
goto print_usage;
|
||||
strbuf_addf(&pathname, "//./pipe/%s", filename);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user