These messages can be .rodata, so make them even more const.

 -Erik

diff --git a/include/libbb.h b/include/libbb.h
index 0ceb983cd10420450c9b027ec72dc5482330c9ff..a53e647d326cb53194d2c7687b26993ae8dc8d33 100644 (file)
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -268,18 +268,18 @@ enum {
        FILEUTILS_INTERACTIVE = 16
 };
 
-extern const char *applet_name;
-extern const char *full_version;
-extern const char *name_too_long;
-extern const char *omitting_directory;
-extern const char *not_a_directory;
-extern const char *memory_exhausted;
-extern const char *invalid_date;
-extern const char *invalid_option;
-extern const char *io_error;
-extern const char *dash_dash_help;
-extern const char *write_error;
-extern const char *too_few_args;
-extern const char *name_longer_than_foo;
+extern const char * const applet_name;
+extern const char * const full_version;
+extern const char * const name_too_long;
+extern const char * const omitting_directory;
+extern const char * const not_a_directory;
+extern const char * const memory_exhausted;
+extern const char * const invalid_date;
+extern const char * const invalid_option;
+extern const char * const io_error;
+extern const char * const dash_dash_help;
+extern const char * const write_error;
+extern const char * const too_few_args;
+extern const char * const name_longer_than_foo;
 
 #endif /* __LIBBB_H__ */

diff --git a/libbb/libbb.h b/libbb/libbb.h
index 0ceb983cd10420450c9b027ec72dc5482330c9ff..a53e647d326cb53194d2c7687b26993ae8dc8d33 100644 (file)
--- a/libbb/libbb.h
+++ b/libbb/libbb.h
@@ -268,18 +268,18 @@ enum {
        FILEUTILS_INTERACTIVE = 16
 };
 
-extern const char *applet_name;
-extern const char *full_version;
-extern const char *name_too_long;
-extern const char *omitting_directory;
-extern const char *not_a_directory;
-extern const char *memory_exhausted;
-extern const char *invalid_date;
-extern const char *invalid_option;
-extern const char *io_error;
-extern const char *dash_dash_help;
-extern const char *write_error;
-extern const char *too_few_args;
-extern const char *name_longer_than_foo;
+extern const char * const applet_name;
+extern const char * const full_version;
+extern const char * const name_too_long;
+extern const char * const omitting_directory;
+extern const char * const not_a_directory;
+extern const char * const memory_exhausted;
+extern const char * const invalid_date;
+extern const char * const invalid_option;
+extern const char * const io_error;
+extern const char * const dash_dash_help;
+extern const char * const write_error;
+extern const char * const too_few_args;
+extern const char * const name_longer_than_foo;
 
 #endif /* __LIBBB_H__ */

diff --git a/libbb/messages.c b/libbb/messages.c
index bdf931ba650e45a6b23f419b155810f7f752e7b7..99c2bc9d52d9d25d29f9c531d847d5f04f20ace1 100644 (file)
--- a/libbb/messages.c
+++ b/libbb/messages.c
@@ -22,40 +22,40 @@
 #include "libbb.h"
 
 #ifdef L_full_version
-       const char *full_version = BB_BANNER " multi-call binary";
+       const char * const full_version = BB_BANNER " multi-call binary";
 #endif
 #ifdef L_name_too_long
-       const char *name_too_long = "file name too long";
+       const char * const name_too_long = "file name too long";
 #endif
 
 #ifdef L_omitting_directory
-       const char *omitting_directory = "%s: omitting directory";
+       const char * const omitting_directory = "%s: omitting directory";
 #endif
 #ifdef L_not_a_directory
-       const char *not_a_directory = "%s: not a directory";
+       const char * const not_a_directory = "%s: not a directory";
 #endif
 #ifdef L_memory_exhausted
-       const char *memory_exhausted = "memory exhausted";
+       const char * const memory_exhausted = "memory exhausted";
 #endif
 #ifdef L_invalid_date
-       const char *invalid_date = "invalid date `%s'";
+       const char * const invalid_date = "invalid date `%s'";
 #endif
 #ifdef L_invalid_option
-       const char *invalid_option = "invalid option -- %c";
+       const char * const invalid_option = "invalid option -- %c";
 #endif
 #ifdef L_io_error
-       const char *io_error = "%s: input/output error -- %s";
+       const char * const io_error = "%s: input/output error -- %s";
 #endif
 #ifdef L_dash_dash_help
-       const char *dash_dash_help = "--help";
+       const char * const dash_dash_help = "--help";
 #endif
 #ifdef L_write_error
-       const char *write_error = "Write Error";
+       const char * const write_error = "Write Error";
 #endif
 #ifdef L_too_few_args
-       const char *too_few_args = "too few arguments";
+       const char * const too_few_args = "too few arguments";
 #endif
 #ifdef L_name_longer_than_foo
-       const char *name_longer_than_foo = "Names longer than %d chars not supported.";
+       const char * const name_longer_than_foo = "Names longer than %d chars not supported.";
 #endif