From: "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
To: git@vger.kernel.org
Cc: avarab@gmail.com,
"Carlo Marcelo Arenas Belón" <carenas@gmail.com>,
"Randall S . Becker" <rsbecker@nexbridge.com>
Subject: [PATCH] wrapper: remove xunsetenv()
Date: Fri, 29 Oct 2021 14:27:05 -0700 [thread overview]
Message-ID: <20211029212705.31721-1-carenas@gmail.com> (raw)
In-Reply-To: <013a01d7cd092d91cb088b5610nexbridge.com>
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@nexbridge.com>
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
---
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
next parent reply other threads:[~2021-10-29 21:27 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <013a01d7cd092d91cb088b5610nexbridge.com>
2021-10-29 21:27 ` Carlo Marcelo Arenas Belón [this message]
2021-10-29 21:37 ` [PATCH] wrapper: remove xunsetenv() Jeff King
2021-10-29 21:43 ` rsbecker
2021-10-29 21:50 ` Carlo Arenas
2021-10-29 21:56 ` Junio C Hamano
2021-10-29 21:51 ` Jeff King
2021-10-29 21:58 ` Junio C Hamano
2021-10-29 22:00 ` Jeff King
2021-10-29 22:03 ` Junio C Hamano
2021-10-29 23:11 ` Jeff King
2021-10-29 22:01 ` rsbecker
2021-10-29 22:29 ` Junio C Hamano
2021-10-30 0:13 ` rsbecker
2021-10-29 21:37 ` rsbecker
2021-10-29 21:43 ` Carlo Arenas
2021-10-29 21:48 ` rsbecker
2021-10-29 21:53 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211029212705.31721-1-carenas@gmail.com \
--to=carenas@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=rsbecker@nexbridge.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).