Merge branch 'rj/remove-unused-mktemp' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Mar 2017 22:03:24 +0000 (15:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Mar 2017 22:03:24 +0000 (15:03 -0700)
Code cleanup.

* rj/remove-unused-mktemp:
wrapper.c: remove unused gitmkstemps() function
wrapper.c: remove unused git_mkstemp() function

1  2 
cache.h
config.mak.uname
diff --combined cache.h
index c26c45f899d2be6e1618d31881c6be9a212a9077,a575684a98454925b21590f17258f15d95ae8f0f..8a9069dc9fa76f39d236e3c2137fc53285c18ee1
+++ b/cache.h
@@@ -1045,9 -1045,6 +1045,6 @@@ static inline int is_empty_tree_oid(con
        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);
@@@ -1109,7 -1106,7 +1106,7 @@@ char *strbuf_realpath(struct strbuf *re
                      int die_on_error);
  const char *real_path(const char *path);
  const char *real_path_if_valid(const char *path);
 -char *real_pathdup(const char *path);
 +char *real_pathdup(const char *path, int die_on_error);
  const char *absolute_path(const char *path);
  char *absolute_pathdup(const char *path);
  const char *remove_leading_path(const char *in, const char *prefix);
diff --combined config.mak.uname
index a07936da8b24f639059d1f024d3cb888068e0faf,7bdf86d2aa9396af909bf117ed7cf25f12e7144f..399fe192719072691ebdbd7954fd8bd6cc12b96e
@@@ -27,7 -27,6 +27,6 @@@ endi
  ifeq ($(uname_S),Linux)
        HAVE_ALLOCA_H = YesPlease
        NO_STRLCPY = YesPlease
-       NO_MKSTEMPS = YesPlease
        HAVE_PATHS_H = YesPlease
        LIBC_CONTAINS_LIBINTL = YesPlease
        HAVE_DEV_TTY = YesPlease
@@@ -41,7 -40,6 +40,6 @@@ endi
  ifeq ($(uname_S),GNU/kFreeBSD)
        HAVE_ALLOCA_H = YesPlease
        NO_STRLCPY = YesPlease
-       NO_MKSTEMPS = YesPlease
        HAVE_PATHS_H = YesPlease
        DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease
        LIBC_CONTAINS_LIBINTL = YesPlease
@@@ -55,7 -53,6 +53,6 @@@ ifeq ($(uname_S),UnixWare
        SHELL_PATH = /usr/local/bin/bash
        NO_IPV6 = YesPlease
        NO_HSTRERROR = YesPlease
-       NO_MKSTEMPS = YesPlease
        BASIC_CFLAGS += -Kthread
        BASIC_CFLAGS += -I/usr/local/include
        BASIC_LDFLAGS += -L/usr/local/lib
@@@ -79,7 -76,6 +76,6 @@@ ifeq ($(uname_S),SCO_SV
        SHELL_PATH = /usr/bin/bash
        NO_IPV6 = YesPlease
        NO_HSTRERROR = YesPlease
-       NO_MKSTEMPS = YesPlease
        BASIC_CFLAGS += -I/usr/local/include
        BASIC_LDFLAGS += -L/usr/local/lib
        NO_STRCASESTR = YesPlease
@@@ -122,7 -118,6 +118,6 @@@ ifeq ($(uname_S),SunOS
        NO_STRCASESTR = YesPlease
        NO_MEMMEM = YesPlease
        NO_MKDTEMP = YesPlease
-       NO_MKSTEMPS = YesPlease
        NO_REGEX = YesPlease
        NO_MSGFMT_EXTENDED_OPTIONS = YesPlease
        HAVE_DEV_TTY = YesPlease
@@@ -168,7 -163,6 +163,6 @@@ ifeq ($(uname_O),Cygwin
                NO_D_TYPE_IN_DIRENT = YesPlease
                NO_STRCASESTR = YesPlease
                NO_MEMMEM = YesPlease
-               NO_MKSTEMPS = YesPlease
                NO_SYMLINK_HEAD = YesPlease
                NO_IPV6 = YesPlease
                OLD_ICONV = UnfortunatelyYes
@@@ -233,7 -227,6 +227,6 @@@ ifeq ($(uname_S),NetBSD
        BASIC_CFLAGS += -I/usr/pkg/include
        BASIC_LDFLAGS += -L/usr/pkg/lib $(CC_LD_DYNPATH)/usr/pkg/lib
        USE_ST_TIMESPEC = YesPlease
-       NO_MKSTEMPS = YesPlease
        HAVE_PATHS_H = YesPlease
        HAVE_BSD_SYSCTL = YesPlease
  endif
@@@ -242,7 -235,6 +235,6 @@@ ifeq ($(uname_S),AIX
        NO_STRCASESTR = YesPlease
        NO_MEMMEM = YesPlease
        NO_MKDTEMP = YesPlease
-       NO_MKSTEMPS = YesPlease
        NO_STRLCPY = YesPlease
        NO_NSEC = YesPlease
        FREAD_READS_DIRECTORIES = UnfortunatelyYes
@@@ -263,7 -255,6 +255,6 @@@ ifeq ($(uname_S),GNU
        # GNU/Hurd
        HAVE_ALLOCA_H = YesPlease
        NO_STRLCPY = YesPlease
-       NO_MKSTEMPS = YesPlease
        HAVE_PATHS_H = YesPlease
        LIBC_CONTAINS_LIBINTL = YesPlease
  endif
@@@ -272,7 -263,6 +263,6 @@@ ifeq ($(uname_S),IRIX
        NO_UNSETENV = YesPlease
        NO_STRCASESTR = YesPlease
        NO_MEMMEM = YesPlease
-       NO_MKSTEMPS = YesPlease
        NO_MKDTEMP = YesPlease
        # When compiled with the MIPSpro 7.4.4m compiler, and without pthreads
        # (i.e. NO_PTHREADS is set), and _with_ MMAP (i.e. NO_MMAP is not set),
@@@ -291,7 -281,6 +281,6 @@@ ifeq ($(uname_S),IRIX64
        NO_UNSETENV = YesPlease
        NO_STRCASESTR = YesPlease
        NO_MEMMEM = YesPlease
-       NO_MKSTEMPS = YesPlease
        NO_MKDTEMP = YesPlease
        # When compiled with the MIPSpro 7.4.4m compiler, and without pthreads
        # (i.e. NO_PTHREADS is set), and _with_ MMAP (i.e. NO_MMAP is not set),
@@@ -311,7 -300,6 +300,6 @@@ ifeq ($(uname_S),HP-UX
        NO_SETENV = YesPlease
        NO_STRCASESTR = YesPlease
        NO_MEMMEM = YesPlease
-       NO_MKSTEMPS = YesPlease
        NO_STRLCPY = YesPlease
        NO_MKDTEMP = YesPlease
        NO_UNSETENV = YesPlease
@@@ -352,7 -340,6 +340,6 @@@ ifeq ($(uname_S),Windows
        NO_ICONV = YesPlease
        NO_STRTOUMAX = YesPlease
        NO_MKDTEMP = YesPlease
-       NO_MKSTEMPS = YesPlease
        SNPRINTF_RETURNS_BOGUS = YesPlease
        NO_SVN_TESTS = YesPlease
        RUNTIME_PREFIX = YesPlease
@@@ -402,7 -389,6 +389,6 @@@ ifeq ($(uname_S),Interix
        NO_MKDTEMP = YesPlease
        NO_STRTOUMAX = YesPlease
        NO_NSEC = YesPlease
-       NO_MKSTEMPS = YesPlease
        ifeq ($(uname_R),3.5)
                NO_INET_NTOP = YesPlease
                NO_INET_PTON = YesPlease
@@@ -461,7 -447,6 +447,6 @@@ ifeq ($(uname_S),NONSTOP_KERNEL
        NO_SETENV = YesPlease
        NO_UNSETENV = YesPlease
        NO_MKDTEMP = YesPlease
-       NO_MKSTEMPS = YesPlease
        # Currently libiconv-1.9.1.
        OLD_ICONV = UnfortunatelyYes
        NO_REGEX = YesPlease
@@@ -503,7 -488,6 +488,6 @@@ ifneq (,$(findstring MINGW,$(uname_S))
        NEEDS_LIBICONV = YesPlease
        NO_STRTOUMAX = YesPlease
        NO_MKDTEMP = YesPlease
-       NO_MKSTEMPS = YesPlease
        NO_SVN_TESTS = YesPlease
        NO_PERL_MAKEMAKER = YesPlease
        RUNTIME_PREFIX = YesPlease
        OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
        NO_REGEX = YesPlease
        NO_PYTHON = YesPlease
 -      BLK_SHA1 = YesPlease
        ETAGS_TARGET = ETAGS
        NO_INET_PTON = YesPlease
        NO_INET_NTOP = YesPlease
@@@ -583,7 -568,6 +567,6 @@@ ifeq ($(uname_S),QNX
        NO_ICONV = YesPlease
        NO_MEMMEM = YesPlease
        NO_MKDTEMP = YesPlease
-       NO_MKSTEMPS = YesPlease
        NO_NSEC = YesPlease
        NO_PTHREADS = YesPlease
        NO_R_TO_GCC_LINKER = YesPlease