Merge branch 'rs/micro-cleanups'

gitster · gitster · commit ff41848e999f · 2020-03-02T15:07:20.000-08:00
Code cleanup.

* rs/micro-cleanups:
  use strpbrk(3) to search for characters from a given set
  quote: use isalnum() to check for alphanumeric characters
diff --git a/builtin/show-branch.c b/builtin/show-branch.c
@@ -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;
 
diff --git a/compat/mingw.c b/compat/mingw.c
@@ -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");
diff --git a/mailinfo.c b/mailinfo.c
@@ -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;
diff --git a/quote.c b/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;
 		}
diff --git a/t/helper/test-windows-named-pipe.c b/t/helper/test-windows-named-pipe.c
@@ -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);
 

Original file line number	Diff line number	Diff line change
`@@ -536,7 +536,7 @@ static void append_one_rev(const char *av)`
`536`	`536`	`append_ref(av, &revkey, 0);`
`537`	`537`	`return;`
`538`	`538`	`}`
`539`		`- if (strchr(av, '*') \|\| strchr(av, '?') \|\| strchr(av, '[')) {`
	`539`	`+ if (strpbrk(av, "*?[")) {`
`540`	`540`	`/* glob style match */`
`541`	`541`	`int saved_matches = ref_name_cnt;`
`542`	`542`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ void sq_quote_buf_pretty(struct strbuf dst, const char src)`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`for (p = src; *p; p++) {`
`58`		`- if (!isalpha(p) && !isdigit(p) && !strchr(ok_punct, *p)) {`
	`58`	`+ if (!isalnum(p) && !strchr(ok_punct, p)) {`
`59`	`59`	`sq_quote_buf(dst, src);`
`60`	`60`	`return;`
`61`	`61`	`}`