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

unsetenv(3) returns int, not void

Browse Source 
This compatilibity implementation has been returning a wrong type,
ever since 731043fd (Add compat/unsetenv.c ., 2006-01-25) added to
the system, yet nobody noticed it in the past 16 years, presumably
because no code checks failures in their unsetenv() calls.  Sigh.

For now, make it always succeed.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2021-10-29 14:42:12 -07:00
parent af6d1d602a
commit a38989bd5b
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

@ -726,7 +726,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