[v2,2/2] path: remove mksnpath()

Commit Message

René Scharfe April 5, 2024, 10:56 a.m. UTC

Remove the function mksnpath(), which has become unused.

Signed-off-by: René Scharfe <[e-mail]>
---
Changes since v1:
- Split out removal of mksnpath() into a separate patch, this one.
- Remove occurrence in contrib/vscode/init.sh as well.

 contrib/vscode/init.sh |  1 -
 path.c                 | 17 -----------------
 path.h                 |  6 ------
 3 files changed, 24 deletions(-)

--
2.44.0

Comments

Jeff King April 5, 2024, 5:37 p.m. UTC | #1

On Fri, Apr 05, 2024 at 12:56:48PM +0200, René Scharfe wrote:

> Remove the function mksnpath(), which has become unused.
> 
> Signed-off-by: René Scharfe <[e-mail]>
> ---
> Changes since v1:
> - Split out removal of mksnpath() into a separate patch, this one.
> - Remove occurrence in contrib/vscode/init.sh as well.

Thanks, both patches (including the errno handling in the first one)
look good to me. I'd probably have waxed philosophical about why
mksnpath() is a bad interface in this one, but I think it's OK to skip
that. ;)

-Peff

Patch

diff --git a/contrib/vscode/init.sh b/contrib/vscode/init.sh
index 521d303722..f2d61bb0e6 100755
--- a/contrib/vscode/init.sh
+++ b/contrib/vscode/init.sh
@@ -92,7 +92,6 @@  cat >.vscode/settings.json.new <<\EOF ||
         "isexe",
         "iskeychar",
         "kompare",
-        "mksnpath",
         "mktag",
         "mktree",
         "mmblob",
diff --git a/path.c b/path.c
index 8bb223c92c..67229edb9c 100644
--- a/path.c
+++ b/path.c
@@ -28,8 +28,6 @@  static int get_st_mode_bits(const char *path, int *mode)
 	return 0;
 }

-static char bad_path[] = "/bad-path/";
-
 static struct strbuf *get_pathname(void)
 {
 	static struct strbuf pathname_array[4] = {
@@ -59,21 +57,6 @@  static void strbuf_cleanup_path(struct strbuf *sb)
 		strbuf_remove(sb, 0, path - sb->buf);
 }

-char *mksnpath(char *buf, size_t n, const char *fmt, ...)
-{
-	va_list args;
-	unsigned len;
-
-	va_start(args, fmt);
-	len = vsnprintf(buf, n, fmt, args);
-	va_end(args);
-	if (len >= n) {
-		strlcpy(buf, bad_path, n);
-		return buf;
-	}
-	return (char *)cleanup_path(buf);
-}
-
 static int dir_prefix(const char *buf, const char *dir)
 {
 	int len = strlen(dir);
diff --git a/path.h b/path.h
index e053effef2..ea96487b29 100644
--- a/path.h
+++ b/path.h
@@ -23,12 +23,6 @@  const char *mkpath(const char *fmt, ...)
 char *mkpathdup(const char *fmt, ...)
 	__attribute__((format (printf, 1, 2)));

-/*
- * Construct a path and place the result in the provided buffer `buf`.
- */
-char *mksnpath(char *buf, size_t n, const char *fmt, ...)
-	__attribute__((format (printf, 3, 4)));
-
 /*
  * The `git_common_path` family of functions will construct a path into a
  * repository's common git directory, which is shared by all worktrees.