[PATCH 1/3] ident: make xgetpwuid_self() a static local helper
- From
Jeff King <peff@peff.net>
- Date
- Dec 10, 2015, 21:33 UTC
- Message-ID
- <20151210213304.GA8374@sigill.intra.peff.net>
- In-Reply-To
- <20151210213228.GB29055@sigill.intra.peff.net>
This function is defined in wrapper.c, but nobody besides ident.c uses it. And nobody is likely to in the future, either, as anything that cares about the user's name should be going through the ident code.
Moving it here is a cleanup of the global namespace, but it will also enable further cleanups inside ident.c.
Signed-off-by: Jeff King <peff@peff.net> --- git-compat-util.h | 3 --- ident.c | 12 ++++++++++++ wrapper.c | 12 ------------ 3 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/git-compat-util.h b/git-compat-util.h index 8e39867..2da0a75 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -929,9 +929,6 @@ int access_or_die(const char *path, int mode, unsigned flag); /* Warn on an inaccessible file that ought to be accessible */ void warn_on_inaccessible(const char *path); -/* Get the passwd entry for the UID of the current process. */ -struct passwd *xgetpwuid_self(void); - #ifdef GMTIME_UNRELIABLE_ERRORS struct tm *git_gmtime(const time_t *); struct tm *git_gmtime_r(const time_t *, struct tm *); diff --git a/ident.c b/ident.c index 5ff1aad..d7c70e2 100644 --- a/ident.c +++ b/ident.c @@ -23,6 +23,18 @@ static int author_ident_explicitly_given; #define get_gecos(struct_passwd) ((struct_passwd)->pw_gecos) #endif +static struct passwd *xgetpwuid_self(void) +{ + struct passwd *pw; + + errno = 0; + pw = getpwuid(getuid()); + if (!pw) + die(_("unable to look up current user in the passwd file: %s"), + errno ? strerror(errno) : _("no such user")); + return pw; +} + static void copy_gecos(const struct passwd *w, struct strbuf *name) { char *src; diff --git a/wrapper.c b/wrapper.c index 6fcaa4d..c95e290 100644 --- a/wrapper.c +++ b/wrapper.c @@ -601,18 +601,6 @@ int access_or_die(const char *path, int mode, unsigned flag) return ret; } -struct passwd *xgetpwuid_self(void) -{ - struct passwd *pw; - - errno = 0; - pw = getpwuid(getuid()); - if (!pw) - die(_("unable to look up current user in the passwd file: %s"), - errno ? strerror(errno) : _("no such user")); - return pw; -} - char *xgetcwd(void) { struct strbuf sb = STRBUF_INIT;
-- 2.6.3.636.g1460207