[PATCH 1/2] wrapper.c: remove unused git_mkstemp() function

Ramsay Jones· Feb 28, 2017, 01:24 UTC · lore

The last caller of git_mkstemp() was removed in commit 6fec0a89 ("verify_signed_buffer: use tempfile object", 16-06-2016). Since the introduction of the 'tempfile' APIs, along with git_mkstemp_mode, it is unlikely that new callers will materialize. Remove the dead code.

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---
 cache.h   |  3 ---
 wrapper.c | 17 -----------------
 2 files changed, 20 deletions(-)

Show changes to 2 files +0 −20

cache.h, wrapper.c

diff --git a/cache.h b/cache.h
index 61fc86e6d..a575684a9 100644
--- a/cache.h
+++ b/cache.h
@@ -1045,9 +1045,6 @@ static inline int is_empty_tree_oid(const struct object_id *oid)
 	return !hashcmp(oid->hash, EMPTY_TREE_SHA1_BIN);
 }
 
-
-int git_mkstemp(char *path, size_t n, const char *template);
-
 /* set default permissions by passing mode arguments to open(2) */
 int git_mkstemps_mode(char *pattern, int suffix_len, int mode);
 int git_mkstemp_mode(char *pattern, int mode);
diff --git a/wrapper.c b/wrapper.c
index e7f197996..1a140639f 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -440,23 +440,6 @@ int xmkstemp(char *template)
 	return fd;
 }
 
-/* git_mkstemp() - create tmp file honoring TMPDIR variable */
-int git_mkstemp(char *path, size_t len, const char *template)
-{
-	const char *tmp;
-	size_t n;
-
-	tmp = getenv("TMPDIR");
-	if (!tmp)
-		tmp = "/tmp";
-	n = snprintf(path, len, "%s/%s", tmp, template);
-	if (len <= n) {
-		errno = ENAMETOOLONG;
-		return -1;
-	}
-	return mkstemp(path);
-}
-
 /* Adapted from libiberty's mkstemp.c. */
 
 #undef TMP_MAX

-- 
2.12.0

Jeff King· Feb 28, 2017, 13:12 UTC · re: Ramsay Jones · lore

Re: [PATCH 1/2] wrapper.c: remove unused git_mkstemp() function

On Tue, Feb 28, 2017 at 01:24:10AM +0000, Ramsay Jones wrote:

Show 5 quoted lines

> The last caller of git_mkstemp() was removed in commit 6fec0a89
> ("verify_signed_buffer: use tempfile object", 16-06-2016). Since
> the introduction of the 'tempfile' APIs, along with git_mkstemp_mode,
> it is unlikely that new callers will materialize. Remove the dead
> code.

Yeah, I think the tempfile API is a better choice for anybody who wants to add a new call. Removing the temptation (and the dead code) is a good move.

-Peff

patch, 2 partswrapper.c: remove unused git_mkstemp() function