Make suffix_mult structures const. Thanks to Vladimir N. Oleynik.

diff --git a/busybox.h b/busybox.h
index fc5e8d8744f2eb5797a6282fb96376315725bd9a..2fc0cc7e08eaab5c48852cb6d89ede12a0ed69d9 100644 (file)
--- a/busybox.h
+++ b/busybox.h
@@ -167,7 +167,8 @@ struct suffix_mult {
        int mult;
 };
 
-extern unsigned long parse_number(const char *numstr, struct suffix_mult *suffixes);
+extern unsigned long parse_number(const char *numstr,
+               const struct suffix_mult *suffixes);
 
 
 /* These parse entries in /etc/passwd and /etc/group.  This is desirable

diff --git a/coreutils/dd.c b/coreutils/dd.c
index 582310681eb83f781ee10427f9c62a142fbe2398..75bbfbac2d4778db4d75fe3d6b47a2b14c1757c1 100644 (file)
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <fcntl.h>
 
-static struct suffix_mult dd_suffixes[] = {
+static const struct suffix_mult dd_suffixes[] = {
        { "c", 1 },
        { "w", 2 },
        { "b", 512 },

diff --git a/coreutils/tail.c b/coreutils/tail.c
index 40511aa7bbf3663dff4a90b4864cee8181470f32..d45b29c4c082cec6453ddfc0b366af1af91d2244 100644 (file)
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-static struct suffix_mult tail_suffixes[] = {
+static const struct suffix_mult tail_suffixes[] = {
        { "b", 512 },
        { "k", 1024 },
        { "m", 1048576 },
@@ -38,7 +38,7 @@ static struct suffix_mult tail_suffixes[] = {
 };
 
 #ifndef BB_FEATURE_SIMPLE_TAIL
-static struct suffix_mult null_suffixes[] = {
+static const struct suffix_mult null_suffixes[] = {
        { NULL, 0 }
 };
 #endif

diff --git a/dd.c b/dd.c
index 582310681eb83f781ee10427f9c62a142fbe2398..75bbfbac2d4778db4d75fe3d6b47a2b14c1757c1 100644 (file)
--- a/dd.c
+++ b/dd.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <fcntl.h>
 
-static struct suffix_mult dd_suffixes[] = {
+static const struct suffix_mult dd_suffixes[] = {
        { "c", 1 },
        { "w", 2 },
        { "b", 512 },

diff --git a/include/busybox.h b/include/busybox.h
index fc5e8d8744f2eb5797a6282fb96376315725bd9a..2fc0cc7e08eaab5c48852cb6d89ede12a0ed69d9 100644 (file)
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -167,7 +167,8 @@ struct suffix_mult {
        int mult;
 };
 
-extern unsigned long parse_number(const char *numstr, struct suffix_mult *suffixes);
+extern unsigned long parse_number(const char *numstr,
+               const struct suffix_mult *suffixes);
 
 
 /* These parse entries in /etc/passwd and /etc/group.  This is desirable

diff --git a/tail.c b/tail.c
index 40511aa7bbf3663dff4a90b4864cee8181470f32..d45b29c4c082cec6453ddfc0b366af1af91d2244 100644 (file)
--- a/tail.c
+++ b/tail.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-static struct suffix_mult tail_suffixes[] = {
+static const struct suffix_mult tail_suffixes[] = {
        { "b", 512 },
        { "k", 1024 },
        { "m", 1048576 },
@@ -38,7 +38,7 @@ static struct suffix_mult tail_suffixes[] = {
 };
 
 #ifndef BB_FEATURE_SIMPLE_TAIL
-static struct suffix_mult null_suffixes[] = {
+static const struct suffix_mult null_suffixes[] = {
        { NULL, 0 }
 };
 #endif

diff --git a/utility.c b/utility.c
index f99c613a16f263c88ed37cc0f6f68bfd566d9b07..aa1fa943b6b7fe8e2d174246c695f17b8edece5c 100644 (file)
--- a/utility.c
+++ b/utility.c
@@ -1696,9 +1696,10 @@ struct BB_applet *find_applet_by_name(const char *name)
 }
 
 #if defined BB_DD || defined BB_TAIL
-unsigned long parse_number(const char *numstr, struct suffix_mult *suffixes)
+unsigned long parse_number(const char *numstr,
+               const struct suffix_mult *suffixes)
 {
-       struct suffix_mult *sm;
+       const struct suffix_mult *sm;
        unsigned long int ret;
        int len;
        char *end;