diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-08 16:07:02 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-08 16:07:02 +0000 |
commit | 240a1cfbbe6cf42e8013ce06cb567b3f28c8727f (patch) | |
tree | 8e69bb572dbb2636689a15b21d7a646e942b5091 /util-linux | |
parent | 5694d5f8d22be2f5be53b2d0ce2e0283ef57d93f (diff) | |
download | busybox-w32-240a1cfbbe6cf42e8013ce06cb567b3f28c8727f.tar.gz busybox-w32-240a1cfbbe6cf42e8013ce06cb567b3f28c8727f.tar.bz2 busybox-w32-240a1cfbbe6cf42e8013ce06cb567b3f28c8727f.zip |
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
Diffstat (limited to 'util-linux')
-rw-r--r-- | util-linux/ipcrm.c | 3 | ||||
-rw-r--r-- | util-linux/mount.c | 4 |
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) | |||
154 | 154 | ||
155 | if (id < 0) { | 155 | if (id < 0) { |
156 | const char *errmsg; | 156 | const char *errmsg; |
157 | const char *const what = "key"; | ||
158 | 157 | ||
159 | error++; | 158 | error++; |
160 | switch (errno) { | 159 | switch (errno) { |
@@ -171,7 +170,7 @@ int ipcrm_main(int argc, char **argv) | |||
171 | errmsg = "unknown error in"; | 170 | errmsg = "unknown error in"; |
172 | break; | 171 | break; |
173 | } | 172 | } |
174 | bb_error_msg("%s %s (%s)", errmsg, what, optarg); | 173 | bb_error_msg("%s %s (%s)", errmsg, "key", optarg); |
175 | continue; | 174 | continue; |
176 | } | 175 | } |
177 | } else { | 176 | } 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) | |||
891 | for (opt = strtok(filteropts, ","); opt; opt = strtok(NULL, ",")) { | 891 | for (opt = strtok(filteropts, ","); opt; opt = strtok(NULL, ",")) { |
892 | char *opteq = strchr(opt, '='); | 892 | char *opteq = strchr(opt, '='); |
893 | if (opteq) { | 893 | if (opteq) { |
894 | const char *const options[] = { | 894 | static const char *const options[] = { |
895 | /* 0 */ "rsize", | 895 | /* 0 */ "rsize", |
896 | /* 1 */ "wsize", | 896 | /* 1 */ "wsize", |
897 | /* 2 */ "timeo", | 897 | /* 2 */ "timeo", |
@@ -996,7 +996,7 @@ static int nfsmount(struct mntent *mp, int vfsflags, char *filteropts) | |||
996 | } | 996 | } |
997 | } | 997 | } |
998 | else { | 998 | else { |
999 | const char *const options[] = { | 999 | static const char *const options[] = { |
1000 | "bg", | 1000 | "bg", |
1001 | "fg", | 1001 | "fg", |
1002 | "soft", | 1002 | "soft", |