path.c: rename vsnpath() to do_git_path()

pclouds · gitster · commit 8afdaf39e318 · 2014-12-01T11:00:11.000-08:00
The name vsnpath() gives an impression that this is general path
handling function. It's not. This is the underlying implementation of
git_path(), git_pathdup() and strbuf_git_path() which will prefix
$GIT_DIR in the result string.

Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/path.c b/path.c
@@ -60,7 +60,7 @@ char *mksnpath(char *buf, size_t n, const char *fmt, ...)
 	return cleanup_path(buf);
 }
 
-static void vsnpath(struct strbuf *buf, const char *fmt, va_list args)
+static void do_git_path(struct strbuf *buf, const char *fmt, va_list args)
 {
 	const char *git_dir = get_git_dir();
 	strbuf_addstr(buf, git_dir);
@@ -74,7 +74,7 @@ void strbuf_git_path(struct strbuf *sb, const char *fmt, ...)
 {
 	va_list args;
 	va_start(args, fmt);
-	vsnpath(sb, fmt, args);
+	do_git_path(sb, fmt, args);
 	va_end(args);
 }
 
@@ -83,7 +83,7 @@ char *git_pathdup(const char *fmt, ...)
 	struct strbuf path = STRBUF_INIT;
 	va_list args;
 	va_start(args, fmt);
-	vsnpath(&path, fmt, args);
+	do_git_path(&path, fmt, args);
 	va_end(args);
 	return strbuf_detach(&path, NULL);
 }
@@ -114,7 +114,7 @@ const char *git_path(const char *fmt, ...)
 	struct strbuf *pathname = get_pathname();
 	va_list args;
 	va_start(args, fmt);
-	vsnpath(pathname, fmt, args);
+	do_git_path(pathname, fmt, args);
 	va_end(args);
 	return pathname->buf;
 }

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ char mksnpath(char buf, size_t n, const char *fmt, ...)`
`60`	`60`	`return cleanup_path(buf);`
`61`	`61`	`}`
`62`	`62`
`63`		`-static void vsnpath(struct strbuf buf, const char fmt, va_list args)`
	`63`	`+static void do_git_path(struct strbuf buf, const char fmt, va_list args)`
`64`	`64`	`{`
`65`	`65`	`const char *git_dir = get_git_dir();`
`66`	`66`	`strbuf_addstr(buf, git_dir);`
`@@ -74,7 +74,7 @@ void strbuf_git_path(struct strbuf sb, const char fmt, ...)`
`74`	`74`	`{`
`75`	`75`	`va_list args;`
`76`	`76`	`va_start(args, fmt);`
`77`		`- vsnpath(sb, fmt, args);`
	`77`	`+ do_git_path(sb, fmt, args);`
`78`	`78`	`va_end(args);`
`79`	`79`	`}`
`80`	`80`
`@@ -83,7 +83,7 @@ char git_pathdup(const char fmt, ...)`
`83`	`83`	`struct strbuf path = STRBUF_INIT;`
`84`	`84`	`va_list args;`
`85`	`85`	`va_start(args, fmt);`
`86`		`- vsnpath(&path, fmt, args);`
	`86`	`+ do_git_path(&path, fmt, args);`
`87`	`87`	`va_end(args);`
`88`	`88`	`return strbuf_detach(&path, NULL);`
`89`	`89`	`}`
`@@ -114,7 +114,7 @@ const char git_path(const char fmt, ...)`
`114`	`114`	`struct strbuf *pathname = get_pathname();`
`115`	`115`	`va_list args;`
`116`	`116`	`va_start(args, fmt);`
`117`		`- vsnpath(pathname, fmt, args);`
	`117`	`+ do_git_path(pathname, fmt, args);`
`118`	`118`	`va_end(args);`
`119`	`119`	`return pathname->buf;`
`120`	`120`	`}`