On October 29, 2021 5:27 PM, Carlo Marcelo Arenas Belón wrote:
> Platforms that are using the git compatibility layer for unsetenv use void as a
> return value for unsetenv(), so any function that checks for a return value will
> fail to build.
>
> Remove the unused wrapper function.
>
> Reported-by: Randall S. Becker <rsbecker@xxxxxxxxxxxxx>
> Signed-off-by: Carlo Marcelo Arenas Belón <carenas@xxxxxxxxx>
> ---
> git-compat-util.h | 1 -
> wrapper.c | 6 ------
> 2 files changed, 7 deletions(-)
>
> diff --git a/git-compat-util.h b/git-compat-util.h index 141bb86351..d70ce14286
> 100644
> --- a/git-compat-util.h
> +++ b/git-compat-util.h
> @@ -879,7 +879,6 @@ char *xstrndup(const char *str, size_t len); void
> *xrealloc(void *ptr, size_t size); void *xcalloc(size_t nmemb, size_t size); void
> xsetenv(const char *name, const char *value, int overwrite); -void
> xunsetenv(const char *name); void *xmmap(void *start, size_t length, int prot,
> int flags, int fd, off_t offset); const char *mmap_os_err(void); void
> *xmmap_gently(void *start, size_t length, int prot, int flags, int fd, off_t offset);
> diff --git a/wrapper.c b/wrapper.c index 1460d4e27b..36e12119d7 100644
> --- a/wrapper.c
> +++ b/wrapper.c
> @@ -151,12 +151,6 @@ void xsetenv(const char *name, const char *value, int
> overwrite)
> die_errno(_("could not setenv '%s'"), name ? name : "(null)"); }
>
> -void xunsetenv(const char *name)
> -{
> - if (!unsetenv(name))
> - die_errno(_("could not unsetenv '%s'"), name ? name : "(null)");
> -}
> -
> /*
> * Limit size of IO chunks, because huge chunks only cause pain. OS X
> * 64-bit is buggy, returning EINVAL if len >= INT_MAX; and even in
> --
> 2.33.1.1200.g715dc68e71
I will be submitting a separate patch to turn off NO_SETENV and NO_UNSETENV for the NonStop x86 platform, where the calls have been supported since October 2020. The ia64 platform will have to continue to use the compat layer.
Thank you for solving this.
Randall
