development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-06 08:39:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/unsetenv-returns-an-int'

Browse source 
The compatibility implementation for unsetenv(3) were written to
mimic ancient, non-POSIX, variant seen in an old glibc; it has been
changed to return an integer to match the more modern era.

* jc/unsetenv-returns-an-int:
  unsetenv(3) returns int, not void
This commit is contained in:
Junio C Hamano 2021-11-29 15:41:48 -08:00
parent 5126145ba8 a38989bd5b
commit 0ae87432aa
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
compat/unsetenv.c
View file

@ -1,6 +1,6 @@
#include "../git-compat-util.h" #include "../git-compat-util.h"
void gitunsetenv (const char *name) int gitunsetenv(const char *name)
{ {
#if !defined(__MINGW32__) #if !defined(__MINGW32__)
extern char **environ; extern char **environ;
@ -24,4 +24,6 @@ void gitunsetenv (const char *name)
++dst; ++dst;
} }
environ[dst] = NULL; environ[dst] = NULL;
return 0;
} }

2
git-compat-util.h
View file

@ -729,7 +729,7 @@ char *gitmkdtemp(char *);
#ifdef NO_UNSETENV #ifdef NO_UNSETENV
#define unsetenv gitunsetenv #define unsetenv gitunsetenv
void gitunsetenv(const char *); int gitunsetenv(const char *);
#endif #endif
#ifdef NO_STRCASESTR #ifdef NO_STRCASESTR