зеркало из https://github.com/microsoft/git.git
use strpbrk(3) to search for characters from a given set
We can check if certain characters are present in a string by calling strchr(3) on each of them, or we can pass them all to a single strpbrk(3) call. The latter is shorter, less repetitive and slightly more efficient, so let's do that instead. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
2b3c430bce
Коммит
2ce6d075fa
|
@ -536,7 +536,7 @@ static void append_one_rev(const char *av)
|
||||||
append_ref(av, &revkey, 0);
|
append_ref(av, &revkey, 0);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (strchr(av, '*') || strchr(av, '?') || strchr(av, '[')) {
|
if (strpbrk(av, "*?[")) {
|
||||||
/* glob style match */
|
/* glob style match */
|
||||||
int saved_matches = ref_name_cnt;
|
int saved_matches = ref_name_cnt;
|
||||||
|
|
||||||
|
|
|
@ -1232,7 +1232,7 @@ static char *path_lookup(const char *cmd, int exe_only)
|
||||||
int len = strlen(cmd);
|
int len = strlen(cmd);
|
||||||
int isexe = len >= 4 && !strcasecmp(cmd+len-4, ".exe");
|
int isexe = len >= 4 && !strcasecmp(cmd+len-4, ".exe");
|
||||||
|
|
||||||
if (strchr(cmd, '/') || strchr(cmd, '\\'))
|
if (strpbrk(cmd, "/\\"))
|
||||||
return xstrdup(cmd);
|
return xstrdup(cmd);
|
||||||
|
|
||||||
path = mingw_getenv("PATH");
|
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)
|
static void get_sane_name(struct strbuf *out, struct strbuf *name, struct strbuf *email)
|
||||||
{
|
{
|
||||||
struct strbuf *src = name;
|
struct strbuf *src = name;
|
||||||
if (name->len < 3 || 60 < name->len || strchr(name->buf, '@') ||
|
if (name->len < 3 || 60 < name->len || strpbrk(name->buf, "@<>"))
|
||||||
strchr(name->buf, '<') || strchr(name->buf, '>'))
|
|
||||||
src = email;
|
src = email;
|
||||||
else if (name == out)
|
else if (name == out)
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -19,7 +19,7 @@ int cmd__windows_named_pipe(int argc, const char **argv)
|
||||||
if (argc < 2)
|
if (argc < 2)
|
||||||
goto print_usage;
|
goto print_usage;
|
||||||
filename = argv[1];
|
filename = argv[1];
|
||||||
if (strchr(filename, '/') || strchr(filename, '\\'))
|
if (strpbrk(filename, "/\\"))
|
||||||
goto print_usage;
|
goto print_usage;
|
||||||
strbuf_addf(&pathname, "//./pipe/%s", filename);
|
strbuf_addf(&pathname, "//./pipe/%s", filename);
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче