undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cb/no-more-gmtime'

Browse Source 
Code clean-up by removing a compatibility implementation of a
function we no longer use.

* cb/no-more-gmtime:
  compat: remove gmtime
This commit is contained in:
Junio C Hamano 2020-05-20 08:33:27 -07:00
commit 7b304ab16c
4 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -399,9 +399,6 @@ all::
# with a different indexfile format version. If it isn't set the index # with a different indexfile format version. If it isn't set the index
# file format used is index-v[23]. # file format used is index-v[23].
# #
# Define GMTIME_UNRELIABLE_ERRORS if your gmtime() function does not
# return NULL when it receives a bogus time_t.
#
# Define HAVE_CLOCK_GETTIME if your platform has clock_gettime. # Define HAVE_CLOCK_GETTIME if your platform has clock_gettime.
# #
# Define HAVE_CLOCK_MONOTONIC if your platform has CLOCK_MONOTONIC. # Define HAVE_CLOCK_MONOTONIC if your platform has CLOCK_MONOTONIC.
@ -1809,11 +1806,6 @@ ifndef NO_MSGFMT_EXTENDED_OPTIONS
MSGFMT += --check --statistics MSGFMT += --check --statistics
endif endif
ifdef GMTIME_UNRELIABLE_ERRORS
COMPAT_OBJS += compat/gmtime.o
BASIC_CFLAGS += -DGMTIME_UNRELIABLE_ERRORS
endif
ifdef HAVE_CLOCK_GETTIME ifdef HAVE_CLOCK_GETTIME
BASIC_CFLAGS += -DHAVE_CLOCK_GETTIME BASIC_CFLAGS += -DHAVE_CLOCK_GETTIME
endif endif

29
compat/gmtime.c
View File

@ -1,29 +0,0 @@
#include "../git-compat-util.h"
#undef gmtime
#undef gmtime_r
struct tm *git_gmtime(const time_t *timep)
{
static struct tm result;
return git_gmtime_r(timep, &result);
}
struct tm *git_gmtime_r(const time_t *timep, struct tm *result)
{
struct tm *ret;
memset(result, 0, sizeof(*result));
ret = gmtime_r(timep, result);
/*
* Rather than NULL, FreeBSD gmtime simply leaves the "struct tm"
* untouched when it encounters overflow. Since "mday" cannot otherwise
* be zero, we can test this very quickly.
*/
if (ret && !ret->tm_mday) {
ret = NULL;
errno = EOVERFLOW;
}
return ret;
}

1
config.mak.uname
View File

@ -246,7 +246,6 @@ ifeq ($(uname_S),FreeBSD)
PYTHON_PATH = /usr/local/bin/python PYTHON_PATH = /usr/local/bin/python
PERL_PATH = /usr/local/bin/perl PERL_PATH = /usr/local/bin/perl
HAVE_PATHS_H = YesPlease HAVE_PATHS_H = YesPlease
GMTIME_UNRELIABLE_ERRORS = UnfortunatelyYes
HAVE_BSD_SYSCTL = YesPlease HAVE_BSD_SYSCTL = YesPlease
HAVE_BSD_KERN_PROC_SYSCTL = YesPlease HAVE_BSD_KERN_PROC_SYSCTL = YesPlease
PAGER_ENV = LESS=FRX LV=-c MORE=FRX PAGER_ENV = LESS=FRX LV=-c MORE=FRX

7
git-compat-util.h
View File

@ -1216,13 +1216,6 @@ int access_or_die(const char *path, int mode, unsigned flag);
/* Warn on an inaccessible file if errno indicates this is an error */ /* Warn on an inaccessible file if errno indicates this is an error */
int warn_on_fopen_errors(const char *path); int warn_on_fopen_errors(const char *path);
#ifdef GMTIME_UNRELIABLE_ERRORS
struct tm *git_gmtime(const time_t *);
struct tm *git_gmtime_r(const time_t *, struct tm *);
#define gmtime git_gmtime
#define gmtime_r git_gmtime_r
#endif
#if !defined(USE_PARENS_AROUND_GETTEXT_N) && defined(__GNUC__) #if !defined(USE_PARENS_AROUND_GETTEXT_N) && defined(__GNUC__)
#define USE_PARENS_AROUND_GETTEXT_N 1 #define USE_PARENS_AROUND_GETTEXT_N 1
#endif #endif