diff options
| author | Jeff King <peff@peff.net> | 2015-12-11 00:33:05 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-11 02:38:59 +0300 |
| commit | e850194c83985396435b01b70d2db00b6d3af02e (patch) | |
| tree | a13a88de4799865914dd7798306af1716472d376 | |
| parent | bc497127894ab6ad955d474c72836c03282e6c6f (diff) | |
ident: make xgetpwuid_self() a static local helper
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | git-compat-util.h | 3 | ||||
| -rw-r--r-- | ident.c | 12 | ||||
| -rw-r--r-- | wrapper.c | 12 |
3 files changed, 12 insertions, 15 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index 4fe10cc146..0feeae2983 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -923,9 +923,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 *); @@ -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; @@ -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; |