Skip to content

Commit

Permalink
ident: make xgetpwuid_self() a static local helper
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Dec 10, 2015
1 parent bc49712 commit e850194
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 15 deletions.
3 changes: 0 additions & 3 deletions git-compat-util.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 *);
Expand Down
12 changes: 12 additions & 0 deletions ident.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 0 additions & 12 deletions wrapper.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit e850194

Please sign in to comment.