precompose_utf8: make precompose_string_if_needed() public

tboegi · gitster · commit 5020774aef3f · 2021-04-05T17:30:04.000-07:00
commit 5c32750 (MacOS: precompose_argv_prefix(), 2021-02-03) uses the function precompose_string_if_needed() internally. It is only used from precompose_argv_prefix() and therefore static in compat/precompose_utf8.c Expose this function, it will be used in the next commit. While there, allow passing a NULL pointer, which will return NULL. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/compat/precompose_utf8.c b/compat/precompose_utf8.c
@@ -60,10 +60,12 @@ void probe_utf8_pathname_composition(void)
 	strbuf_release(&path);
 }
 
-static inline const char *precompose_string_if_needed(const char *in)
+const char *precompose_string_if_needed(const char *in)
 {
 	size_t inlen;
 	size_t outlen;
+	if (!in)
+		return NULL;
 	if (has_non_ascii(in, (size_t)-1, &inlen)) {
 		iconv_t ic_prec;
 		char *out;
@@ -96,10 +98,7 @@ const char *precompose_argv_prefix(int argc, const char **argv, const char *pref
 		argv[i] = precompose_string_if_needed(argv[i]);
 		i++;
 	}
-	if (prefix) {
-		prefix = precompose_string_if_needed(prefix);
-	}
-	return prefix;
+	return precompose_string_if_needed(prefix);
 }
 
 
diff --git a/compat/precompose_utf8.h b/compat/precompose_utf8.h
@@ -29,6 +29,7 @@ typedef struct {
 } PREC_DIR;
 
 const char *precompose_argv_prefix(int argc, const char **argv, const char *prefix);
+const char *precompose_string_if_needed(const char *in);
 void probe_utf8_pathname_composition(void);
 
 PREC_DIR *precompose_utf8_opendir(const char *dirname);
diff --git a/git-compat-util.h b/git-compat-util.h
@@ -256,6 +256,11 @@ static inline const char *precompose_argv_prefix(int argc, const char **argv, co
 {
 	return prefix;
 }
+static inline const char *precompose_string_if_needed(const char *in)
+{
+	return in;
+}
+
 #define probe_utf8_pathname_composition()
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -60,10 +60,12 @@ void probe_utf8_pathname_composition(void)`
`60`	`60`	`strbuf_release(&path);`
`61`	`61`	`}`
`62`	`62`
`63`		`-static inline const char precompose_string_if_needed(const char in)`
	`63`	`+const char precompose_string_if_needed(const char in)`
`64`	`64`	`{`
`65`	`65`	`size_t inlen;`
`66`	`66`	`size_t outlen;`
	`67`	`+ if (!in)`
	`68`	`+ return NULL;`
`67`	`69`	`if (has_non_ascii(in, (size_t)-1, &inlen)) {`
`68`	`70`	`iconv_t ic_prec;`
`69`	`71`	`char *out;`
`@@ -96,10 +98,7 @@ const char precompose_argv_prefix(int argc, const char argv, const char pref`
`96`	`98`	`argv[i] = precompose_string_if_needed(argv[i]);`
`97`	`99`	`i++;`
`98`	`100`	`}`
`99`		`- if (prefix) {`
`100`		`- prefix = precompose_string_if_needed(prefix);`
`101`		`- }`
`102`		`- return prefix;`
	`101`	`+ return precompose_string_if_needed(prefix);`
`103`	`102`	`}`
`104`	`103`
`105`	`104`
Original file line number	Diff line number	Diff line change
`@@ -256,6 +256,11 @@ static inline const char precompose_argv_prefix(int argc, const char *argv, co`
`256`	`256`	`{`
`257`	`257`	`return prefix;`
`258`	`258`	`}`
	`259`	`+static inline const char precompose_string_if_needed(const char in)`
	`260`	`+{`
	`261`	`+ return in;`
	`262`	`+}`
	`263`	`+`
`259`	`264`	`#define probe_utf8_pathname_composition()`
`260`	`265`	`#endif`
`261`	`266`