From 240a1cfbbe6cf42e8013ce06cb567b3f28c8727f Mon Sep 17 00:00:00 2001
From: Denis Vlasenko
Date: Sun, 8 Apr 2007 16:07:02 +0000
Subject: add some missed statics on constant objects. fix few #ifndef
 ENABLE_xxx

# size busybox_old busybox_unstripped
   text    data     bss     dec     hex filename
 677152    2920   18208  698280   aa7a8 busybox_old
 676420    2920   18208  697548   aa4cc busybox_unstripped

---
 util-linux/ipcrm.c | 3 +--
 util-linux/mount.c | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'util-linux')

diff --git a/util-linux/ipcrm.c b/util-linux/ipcrm.c
index 9240e2c..d13fb83 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 4a02371..bc1c0d4 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",
-- 
cgit v1.1