diff options
| -rw-r--r-- | misc-utils/hardlink.c | 4 | ||||
| -rw-r--r-- | term-utils/wall.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/misc-utils/hardlink.c b/misc-utils/hardlink.c index 1558573f7..f7cfc961b 100644 --- a/misc-utils/hardlink.c +++ b/misc-utils/hardlink.c @@ -100,9 +100,9 @@ static inline unsigned int hash(off_t size, time_t mtime) } __attribute__ ((always_inline)) -static inline int stcmp(struct stat *st1, struct stat *st2, int content_only) +static inline int stcmp(struct stat *st1, struct stat *st2, int content_scope) { - if (content_only) + if (content_scope) return st1->st_size != st2->st_size; return st1->st_mode != st2->st_mode 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); |