{"thread":{"id":"45244","subject":"[PATCH 2/2] wrapper.c: remove unused gitmkstemps() function","startedAt":"2017-02-28T01:27:20Z","lastAt":"2017-02-28T01:27:20Z","messageCount":1,"participants":["Ramsay Jones"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"312815","messageId":"361c3567-1449-9cc4-f311-ee2c747e934a@ramsayjones.plus.com","threadId":"45244","inReplyTo":null,"subject":"[PATCH 2/2] wrapper.c: remove unused gitmkstemps() function","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsayjones.plus.com","sentAt":"2017-02-28T01:26:06Z","receivedAt":"2017-02-28T01:27:20Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\nThe last call to the mkstemps() function was removed in commit 659488326\n(\"wrapper.c: delete dead function git_mkstemps()\", 22-04-2016). In order\nto support platforms without mkstemps(), this functionality was provided,\nalong with a Makefile build variable (NO_MKSTEMPS), by the gitmkstemps()\nfunction. Remove the dead code, along with the defunct build machinery.\n\nSigned-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>\n---\n Makefile          |  5 -----\n config.mak.uname  | 17 -----------------\n configure.ac      |  6 ------\n git-compat-util.h |  5 -----\n wrapper.c         |  7 -------\n 5 files changed, 40 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 8e4081e06..ca9f16d19 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -102,8 +102,6 @@ all::\n #\n # Define MKDIR_WO_TRAILING_SLASH if your mkdir() can't deal with trailing slash.\n #\n-# Define NO_MKSTEMPS if you don't have mkstemps in the C library.\n-#\n # Define NO_GECOS_IN_PWENT if you don't have pw_gecos in struct passwd\n # in the C library.\n #\n@@ -1280,9 +1278,6 @@ ifdef MKDIR_WO_TRAILING_SLASH\n \tCOMPAT_CFLAGS += -DMKDIR_WO_TRAILING_SLASH\n \tCOMPAT_OBJS += compat/mkdir.o\n endif\n-ifdef NO_MKSTEMPS\n-\tCOMPAT_CFLAGS += -DNO_MKSTEMPS\n-endif\n ifdef NO_UNSETENV\n \tCOMPAT_CFLAGS += -DNO_UNSETENV\n \tCOMPAT_OBJS += compat/unsetenv.o\ndiff --git a/config.mak.uname b/config.mak.uname\nindex 447f36ac2..7bdf86d2a 100644\n--- a/config.mak.uname\n+++ b/config.mak.uname\n@@ -27,7 +27,6 @@ endif\n ifeq ($(uname_S),Linux)\n \tHAVE_ALLOCA_H = YesPlease\n \tNO_STRLCPY = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n \tHAVE_PATHS_H = YesPlease\n \tLIBC_CONTAINS_LIBINTL = YesPlease\n \tHAVE_DEV_TTY = YesPlease\n@@ -41,7 +40,6 @@ endif\n ifeq ($(uname_S),GNU/kFreeBSD)\n \tHAVE_ALLOCA_H = YesPlease\n \tNO_STRLCPY = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n \tHAVE_PATHS_H = YesPlease\n \tDIR_HAS_BSD_GROUP_SEMANTICS = YesPlease\n \tLIBC_CONTAINS_LIBINTL = YesPlease\n@@ -55,7 +53,6 @@ ifeq ($(uname_S),UnixWare)\n \tSHELL_PATH = /usr/local/bin/bash\n \tNO_IPV6 = YesPlease\n \tNO_HSTRERROR = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n \tBASIC_CFLAGS += -Kthread\n \tBASIC_CFLAGS += -I/usr/local/include\n \tBASIC_LDFLAGS += -L/usr/local/lib\n@@ -79,7 +76,6 @@ ifeq ($(uname_S),SCO_SV)\n \tSHELL_PATH = /usr/bin/bash\n \tNO_IPV6 = YesPlease\n \tNO_HSTRERROR = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n \tBASIC_CFLAGS += -I/usr/local/include\n \tBASIC_LDFLAGS += -L/usr/local/lib\n \tNO_STRCASESTR = YesPlease\n@@ -122,7 +118,6 @@ ifeq ($(uname_S),SunOS)\n \tNO_STRCASESTR = YesPlease\n \tNO_MEMMEM = YesPlease\n \tNO_MKDTEMP = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n \tNO_REGEX = YesPlease\n \tNO_MSGFMT_EXTENDED_OPTIONS = YesPlease\n \tHAVE_DEV_TTY = YesPlease\n@@ -168,7 +163,6 @@ ifeq ($(uname_O),Cygwin)\n \t\tNO_D_TYPE_IN_DIRENT = YesPlease\n \t\tNO_STRCASESTR = YesPlease\n \t\tNO_MEMMEM = YesPlease\n-\t\tNO_MKSTEMPS = YesPlease\n \t\tNO_SYMLINK_HEAD = YesPlease\n \t\tNO_IPV6 = YesPlease\n \t\tOLD_ICONV = UnfortunatelyYes\n@@ -233,7 +227,6 @@ ifeq ($(uname_S),NetBSD)\n \tBASIC_CFLAGS += -I/usr/pkg/include\n \tBASIC_LDFLAGS += -L/usr/pkg/lib $(CC_LD_DYNPATH)/usr/pkg/lib\n \tUSE_ST_TIMESPEC = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n \tHAVE_PATHS_H = YesPlease\n \tHAVE_BSD_SYSCTL = YesPlease\n endif\n@@ -242,7 +235,6 @@ ifeq ($(uname_S),AIX)\n \tNO_STRCASESTR = YesPlease\n \tNO_MEMMEM = YesPlease\n \tNO_MKDTEMP = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n \tNO_STRLCPY = YesPlease\n \tNO_NSEC = YesPlease\n \tFREAD_READS_DIRECTORIES = UnfortunatelyYes\n@@ -263,7 +255,6 @@ ifeq ($(uname_S),GNU)\n \t# GNU/Hurd\n \tHAVE_ALLOCA_H = YesPlease\n \tNO_STRLCPY = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n \tHAVE_PATHS_H = YesPlease\n \tLIBC_CONTAINS_LIBINTL = YesPlease\n endif\n@@ -272,7 +263,6 @@ ifeq ($(uname_S),IRIX)\n \tNO_UNSETENV = YesPlease\n \tNO_STRCASESTR = YesPlease\n \tNO_MEMMEM = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n \tNO_MKDTEMP = YesPlease\n \t# When compiled with the MIPSpro 7.4.4m compiler, and without pthreads\n \t# (i.e. NO_PTHREADS is set), and _with_ MMAP (i.e. NO_MMAP is not set),\n@@ -291,7 +281,6 @@ ifeq ($(uname_S),IRIX64)\n \tNO_UNSETENV = YesPlease\n \tNO_STRCASESTR = YesPlease\n \tNO_MEMMEM = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n \tNO_MKDTEMP = YesPlease\n \t# When compiled with the MIPSpro 7.4.4m compiler, and without pthreads\n \t# (i.e. NO_PTHREADS is set), and _with_ MMAP (i.e. NO_MMAP is not set),\n@@ -311,7 +300,6 @@ ifeq ($(uname_S),HP-UX)\n \tNO_SETENV = YesPlease\n \tNO_STRCASESTR = YesPlease\n \tNO_MEMMEM = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n \tNO_STRLCPY = YesPlease\n \tNO_MKDTEMP = YesPlease\n \tNO_UNSETENV = YesPlease\n@@ -352,7 +340,6 @@ ifeq ($(uname_S),Windows)\n \tNO_ICONV = YesPlease\n \tNO_STRTOUMAX = YesPlease\n \tNO_MKDTEMP = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n \tSNPRINTF_RETURNS_BOGUS = YesPlease\n \tNO_SVN_TESTS = YesPlease\n \tRUNTIME_PREFIX = YesPlease\n@@ -402,7 +389,6 @@ ifeq ($(uname_S),Interix)\n \tNO_MKDTEMP = YesPlease\n \tNO_STRTOUMAX = YesPlease\n \tNO_NSEC = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n \tifeq ($(uname_R),3.5)\n \t\tNO_INET_NTOP = YesPlease\n \t\tNO_INET_PTON = YesPlease\n@@ -461,7 +447,6 @@ ifeq ($(uname_S),NONSTOP_KERNEL)\n \tNO_SETENV = YesPlease\n \tNO_UNSETENV = YesPlease\n \tNO_MKDTEMP = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n \t# Currently libiconv-1.9.1.\n \tOLD_ICONV = UnfortunatelyYes\n \tNO_REGEX = YesPlease\n@@ -503,7 +488,6 @@ ifneq (,$(findstring MINGW,$(uname_S)))\n \tNEEDS_LIBICONV = YesPlease\n \tNO_STRTOUMAX = YesPlease\n \tNO_MKDTEMP = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n \tNO_SVN_TESTS = YesPlease\n \tNO_PERL_MAKEMAKER = YesPlease\n \tRUNTIME_PREFIX = YesPlease\n@@ -584,7 +568,6 @@ ifeq ($(uname_S),QNX)\n \tNO_ICONV = YesPlease\n \tNO_MEMMEM = YesPlease\n \tNO_MKDTEMP = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n \tNO_NSEC = YesPlease\n \tNO_PTHREADS = YesPlease\n \tNO_R_TO_GCC_LINKER = YesPlease\ndiff --git a/configure.ac b/configure.ac\nindex 0b15f04b1..128165529 100644\n--- a/configure.ac\n+++ b/configure.ac\n@@ -1050,12 +1050,6 @@ GIT_CHECK_FUNC(mkdtemp,\n [NO_MKDTEMP=YesPlease])\n GIT_CONF_SUBST([NO_MKDTEMP])\n #\n-# Define NO_MKSTEMPS if you don't have mkstemps in the C library.\n-GIT_CHECK_FUNC(mkstemps,\n-[NO_MKSTEMPS=],\n-[NO_MKSTEMPS=YesPlease])\n-GIT_CONF_SUBST([NO_MKSTEMPS])\n-#\n # Define NO_INITGROUPS if you don't have initgroups in the C library.\n GIT_CHECK_FUNC(initgroups,\n [NO_INITGROUPS=],\ndiff --git a/git-compat-util.h b/git-compat-util.h\nindex ef6d560e1..e626851fe 100644\n--- a/git-compat-util.h\n+++ b/git-compat-util.h\n@@ -639,11 +639,6 @@ extern int gitsetenv(const char *, const char *, int);\n extern char *gitmkdtemp(char *);\n #endif\n \n-#ifdef NO_MKSTEMPS\n-#define mkstemps gitmkstemps\n-extern int gitmkstemps(char *, int);\n-#endif\n-\n #ifdef NO_UNSETENV\n #define unsetenv gitunsetenv\n extern void gitunsetenv(const char *);\ndiff --git a/wrapper.c b/wrapper.c\nindex 1a140639f..0542fc758 100644\n--- a/wrapper.c\n+++ b/wrapper.c\n@@ -514,13 +514,6 @@ int git_mkstemp_mode(char *pattern, int mode)\n \treturn git_mkstemps_mode(pattern, 0, mode);\n }\n \n-#ifdef NO_MKSTEMPS\n-int gitmkstemps(char *pattern, int suffix_len)\n-{\n-\treturn git_mkstemps_mode(pattern, suffix_len, 0600);\n-}\n-#endif\n-\n int xmkstemp_mode(char *template, int mode)\n {\n \tint fd;\n-- \n2.12.0\n"}]}