Merge branch 'rs/use-fspathncmp' into maint-2.38

gitster · gitster · commit 92cd390849a6 · 2022-10-27T15:24:13.000-07:00
Code clean-up.

* rs/use-fspathncmp:
  dir: use fspathncmp() in pl_hashmap_cmp()
diff --git a/dir.c b/dir.c
@@ -669,9 +669,7 @@ int pl_hashmap_cmp(const void *cmp_data UNUSED,
 			 ? ee1->patternlen
 			 : ee2->patternlen;
 
-	if (ignore_case)
-		return strncasecmp(ee1->pattern, ee2->pattern, min_len);
-	return strncmp(ee1->pattern, ee2->pattern, min_len);
+	return fspathncmp(ee1->pattern, ee2->pattern, min_len);
 }
 
 static char *dup_and_filter_pattern(const char *pattern)

Original file line number	Diff line number	Diff line change
`@@ -669,9 +669,7 @@ int pl_hashmap_cmp(const void *cmp_data UNUSED,`
`669`	`669`	`? ee1->patternlen`
`670`	`670`	`: ee2->patternlen;`
`671`	`671`
`672`		`- if (ignore_case)`
`673`		`- return strncasecmp(ee1->pattern, ee2->pattern, min_len);`
`674`		`- return strncmp(ee1->pattern, ee2->pattern, min_len);`
	`672`	`+ return fspathncmp(ee1->pattern, ee2->pattern, min_len);`
`675`	`673`	`}`
`676`	`674`
`677`	`675`	`static char dup_and_filter_pattern(const char pattern)`