Skip to content

Commit 10bba53

Browse files
rscharfegitster
authored andcommitted
compat: remove gitmkdtemp()
gitmkdtemp() has become a trivial wrapper around git_mkdtemp(). Remove this now unnecessary layer of indirection. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 7bef658 commit 10bba53

File tree

5 files changed

+2
-14
lines changed

5 files changed

+2
-14
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1917,7 +1917,6 @@ ifdef NO_SETENV
19171917
endif
19181918
ifdef NO_MKDTEMP
19191919
COMPAT_CFLAGS += -DNO_MKDTEMP
1920-
COMPAT_OBJS += compat/mkdtemp.o
19211920
endif
19221921
ifdef MKDIR_WO_TRAILING_SLASH
19231922
COMPAT_CFLAGS += -DMKDIR_WO_TRAILING_SLASH

compat/mkdtemp.c

Lines changed: 0 additions & 6 deletions
This file was deleted.

compat/posix.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,7 @@ int gitsetenv(const char *, const char *, int);
329329
#endif
330330

331331
#ifdef NO_MKDTEMP
332-
#define mkdtemp gitmkdtemp
333-
char *gitmkdtemp(char *);
332+
#define mkdtemp git_mkdtemp
334333
#endif
335334

336335
#ifdef NO_UNSETENV

contrib/buildsystems/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -411,10 +411,6 @@ if(NOT HAVE_SETENV)
411411
list(APPEND compat_SOURCES compat/setenv.c)
412412
endif()
413413

414-
if(NOT HAVE_MKDTEMP)
415-
list(APPEND compat_SOURCES compat/mkdtemp.c)
416-
endif()
417-
418414
if(NOT HAVE_PREAD)
419415
list(APPEND compat_SOURCES compat/pread.c)
420416
endif()

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1401,7 +1401,7 @@ checkfuncs = {
14011401
'strlcpy' : ['strlcpy.c'],
14021402
'strtoull' : [],
14031403
'setenv' : ['setenv.c'],
1404-
'mkdtemp' : ['mkdtemp.c'],
1404+
'mkdtemp' : [],
14051405
'initgroups' : [],
14061406
'strtoumax' : ['strtoumax.c', 'strtoimax.c'],
14071407
'pread' : ['pread.c'],

0 commit comments

Comments
 (0)