From 123eb9ef8cb8dea88a57d86681524e78fdb5e104 Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Sat, 9 Feb 2019 08:47:43 +0000 Subject: hardlink, wall: fix variable shadowing misc-utils/hardlink.c:91:65: warning: declaration shadows a variable in the global scope [-Wshadow] misc-utils/hardlink.c:73:5: note: previous declaration is here int content_only = 0; term-utils/wall.c:114:40: warning: declaration shadows a variable in the global scope [-Wshadow] term-utils/wall.c:129:65: warning: declaration shadows a variable in the global scope [-Wshadow] /usr/include/bits/getopt_core.h:36:14: note: previous declaration is here extern char *optarg; Signed-off-by: Sami Kerola --- term-utils/wall.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'term-utils') diff --git a/term-utils/wall.c b/term-utils/wall.c index 4c49ebaa1..ce5363c7e 100644 --- a/term-utils/wall.c +++ b/term-utils/wall.c @@ -111,26 +111,26 @@ struct group_workspace { #endif }; -static gid_t get_group_gid(const char *optarg) +static gid_t get_group_gid(const char *group) { struct group *gr; gid_t gid; - if ((gr = getgrnam(optarg))) + if ((gr = getgrnam(group))) return gr->gr_gid; - gid = strtou32_or_err(optarg, _("invalid group argument")); + gid = strtou32_or_err(group, _("invalid group argument")); if (!getgrgid(gid)) - errx(EXIT_FAILURE, _("%s: unknown gid"), optarg); + errx(EXIT_FAILURE, _("%s: unknown gid"), group); return gid; } -static struct group_workspace *init_group_workspace(const char *optarg) +static struct group_workspace *init_group_workspace(const char *group) { struct group_workspace *buf = xmalloc(sizeof(struct group_workspace)); - buf->requested_group = get_group_gid(optarg); + buf->requested_group = get_group_gid(group); buf->ngroups = sysconf(_SC_NGROUPS_MAX) + 1; /* room for the primary gid */ buf->groups = xcalloc(sizeof(*buf->groups), buf->ngroups); -- cgit v1.2.3-55-g7522