summaryrefslogtreecommitdiffhomepage
path: root/util-linux
diff options
context:
space:
mode:
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/ipcrm.c3
-rw-r--r--util-linux/mount.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/util-linux/ipcrm.c b/util-linux/ipcrm.c
index 9240e2c4b..d13fb83b1 100644
--- a/util-linux/ipcrm.c
+++ b/util-linux/ipcrm.c
@@ -154,7 +154,6 @@ int ipcrm_main(int argc, char **argv)
if (id < 0) {
const char *errmsg;
- const char *const what = "key";
error++;
switch (errno) {
@@ -171,7 +170,7 @@ int ipcrm_main(int argc, char **argv)
errmsg = "unknown error in";
break;
}
- bb_error_msg("%s %s (%s)", errmsg, what, optarg);
+ bb_error_msg("%s %s (%s)", errmsg, "key", optarg);
continue;
}
} else {
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 4a0237196..bc1c0d4a9 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -891,7 +891,7 @@ static int nfsmount(struct mntent *mp, int vfsflags, char *filteropts)
for (opt = strtok(filteropts, ","); opt; opt = strtok(NULL, ",")) {
char *opteq = strchr(opt, '=');
if (opteq) {
- const char *const options[] = {
+ static const char *const options[] = {
/* 0 */ "rsize",
/* 1 */ "wsize",
/* 2 */ "timeo",
@@ -996,7 +996,7 @@ static int nfsmount(struct mntent *mp, int vfsflags, char *filteropts)
}
}
else {
- const char *const options[] = {
+ static const char *const options[] = {
"bg",
"fg",
"soft",