From 07e3070d2aa69b0c8f1da5f103a87125ff4baaea Mon Sep 17 00:00:00 2001 From: Jeff King Date: Mon, 10 Aug 2015 05:36:27 -0400 Subject: [PATCH] path.c: drop git_path_submodule There are no callers of the slightly-dangerous static-buffer git_path_submodule left. Let's drop it. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- cache.h | 5 ++--- path.c | 10 ---------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/cache.h b/cache.h index 6f74f33f41..7a4fa90e8c 100644 --- a/cache.h +++ b/cache.h @@ -713,12 +713,11 @@ extern int check_repository_format(void); * the repository directory (git_path), or in a submodule's repository * directory (git_path_submodule). In all cases, note that the result * may be overwritten by another call to _any_ of the functions. Consider - * using the safer "dup" or "strbuf" formats below. + * using the safer "dup" or "strbuf" formats below (in some cases, the + * unsafe versions have already been removed). */ extern const char *mkpath(const char *fmt, ...) __attribute__((format (printf, 1, 2))); extern const char *git_path(const char *fmt, ...) __attribute__((format (printf, 1, 2))); -extern const char *git_path_submodule(const char *path, const char *fmt, ...) - __attribute__((format (printf, 2, 3))); extern char *mksnpath(char *buf, size_t n, const char *fmt, ...) __attribute__((format (printf, 3, 4))); diff --git a/path.c b/path.c index 9aad9a1878..94d7ec24e8 100644 --- a/path.c +++ b/path.c @@ -245,16 +245,6 @@ static void do_submodule_path(struct strbuf *buf, const char *path, strbuf_cleanup_path(buf); } -const char *git_path_submodule(const char *path, const char *fmt, ...) -{ - va_list args; - struct strbuf *buf = get_pathname(); - va_start(args, fmt); - do_submodule_path(buf, path, fmt, args); - va_end(args); - return buf->buf; -} - char *git_pathdup_submodule(const char *path, const char *fmt, ...) { va_list args; -- 2.11.4.GIT