You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2011/06/12 02:28:57 UTC
[lucy-commits] svn commit: r1134845 - in /incubator/lucy/trunk/charmonizer/src/Charmonizer:
./ Core/ Probe/ Test/
Author: marvin
Date: Sun Jun 12 00:28:57 2011
New Revision: 1134845
URL: http://svn.apache.org/viewvc?rev=1134845&view=rev
Log:
LUCY-156 Const-ify static char array declarations.
Apply "const" qualifier to numerous local char* and char[] declarations.
Modified:
incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Compiler.c
incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Dir.c
incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/HeaderChecker.c
incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/OperatingSystem.c
incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Stat.c
incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe.c
incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/AtomicOps.c
incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.c
incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.c
incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.c
incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.c
incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/Memory.c
incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.c
incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestFuncMacro.c
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Compiler.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Compiler.c?rev=1134845&r1=1134844&r2=1134845&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Compiler.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Compiler.c Sun Jun 12 00:28:57 2011
@@ -37,17 +37,17 @@ static char *try_app_name = NULL;
/* Detect a supported compiler, or assume a generic GCC-compatible compiler
* and hope for the best. */
#ifdef __GNUC__
-static char *include_flag = "-I ";
-static char *object_flag = "-o ";
-static char *exe_flag = "-o ";
+static const char *include_flag = "-I ";
+static const char *object_flag = "-o ";
+static const char *exe_flag = "-o ";
#elif defined(_MSC_VER)
-static char *include_flag = "/I";
-static char *object_flag = "/Fo";
-static char *exe_flag = "/Fe";
+static const char *include_flag = "/I";
+static const char *object_flag = "/Fo";
+static const char *exe_flag = "/Fe";
#else
-static char *include_flag = "-I ";
-static char *object_flag = "-o ";
-static char *exe_flag = "-o ";
+static const char *include_flag = "-I ";
+static const char *object_flag = "-o ";
+static const char *exe_flag = "-o ";
#endif
/* Clean up the files associated with CC_capture_output().
@@ -264,7 +264,7 @@ S_clean_up_try(void) {
static void
S_do_test_compile(void) {
- char *code = "int main() { return 0; }\n";
+ const char *code = "int main() { return 0; }\n";
chaz_bool_t success;
if (Util_verbosity) {
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Dir.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Dir.c?rev=1134845&r1=1134844&r2=1134845&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Dir.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Dir.c Sun Jun 12 00:28:57 2011
@@ -35,7 +35,7 @@ static char mkdir_command[7];
char *Dir_mkdir_command = mkdir_command;
/* Source code for standard POSIX mkdir */
-static char posix_mkdir_code[] =
+static const char posix_mkdir_code[] =
QUOTE( #include <%s> )
QUOTE( int main(int argc, char **argv) { )
QUOTE( if (argc != 2) { return 1; } )
@@ -44,7 +44,7 @@ static char posix_mkdir_code[] =
QUOTE( } );
/* Source code for Windows _mkdir. */
-static char win_mkdir_code[] =
+static const char win_mkdir_code[] =
QUOTE( #include <direct.h> )
QUOTE( int main(int argc, char **argv) { )
QUOTE( if (argc != 2) { return 1; } )
@@ -53,7 +53,7 @@ static char win_mkdir_code[] =
QUOTE( } );
/* Source code for rmdir. */
-static char rmdir_code[] =
+static const char rmdir_code[] =
QUOTE( #include <%s> )
QUOTE( int main(int argc, char **argv) { )
QUOTE( if (argc != 2) { return 1; } )
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/HeaderChecker.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/HeaderChecker.c?rev=1134845&r1=1134844&r2=1134845&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/HeaderChecker.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/HeaderChecker.c Sun Jun 12 00:28:57 2011
@@ -29,7 +29,7 @@ typedef struct Header {
} Header;
/* "hello_world.c" without the hello or the world. */
-static char test_code[] = "int main() { return 0; }\n";
+static const char test_code[] = "int main() { return 0; }\n";
/* Keep a sorted, dynamically-sized array of names of all headers we've
* checked for so far.
@@ -129,7 +129,7 @@ HeadCheck_check_many_headers(const char
return success;
}
-static char contains_code[] =
+static const char contains_code[] =
QUOTE( #include <stddef.h> )
QUOTE( %s )
QUOTE( int main() { return offsetof(%s, %s); } );
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/OperatingSystem.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/OperatingSystem.c?rev=1134845&r1=1134844&r2=1134845&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/OperatingSystem.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/OperatingSystem.c Sun Jun 12 00:28:57 2011
@@ -28,13 +28,13 @@
static char dev_null[20] = "";
#ifdef _WIN32
-static char *exe_ext = ".exe";
-static char *obj_ext = ".obj";
-static char *local_command_start = ".\\";
+static const char *exe_ext = ".exe";
+static const char *obj_ext = ".obj";
+static const char *local_command_start = ".\\";
#else
-static char *exe_ext = "";
-static char *obj_ext = "";
-static char *local_command_start = "./";
+static const char *exe_ext = "";
+static const char *obj_ext = "";
+static const char *local_command_start = "./";
#endif
static void
@@ -68,7 +68,7 @@ S_probe_dev_null(void) {
strcpy(dev_null, "nul");
#else
{
- char *const options[] = {
+ const char *const options[] = {
"/dev/null",
"/dev/nul",
NULL
@@ -109,7 +109,7 @@ OS_dev_null(void) {
return dev_null;
}
-static char charm_run_code[] =
+static const char charm_run_code[] =
QUOTE( #include <stdio.h> )
QUOTE( #include <stdlib.h> )
QUOTE( #include <string.h> )
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Stat.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Stat.c?rev=1134845&r1=1134844&r2=1134845&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Stat.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Stat.c Sun Jun 12 00:28:57 2011
@@ -67,7 +67,7 @@ Stat_stat(const char *filepath, Stat *ta
}
/* Source code for the _charm_stat utility. */
-static char charm_stat_code[] =
+static const char charm_stat_code[] =
QUOTE( #include <stdio.h> )
QUOTE( #include <sys/stat.h> )
QUOTE( int main(int argc, char **argv) { )
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe.c?rev=1134845&r1=1134844&r2=1134845&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe.c Sun Jun 12 00:28:57 2011
@@ -69,7 +69,7 @@ Probe_get_charmony_fh(void) {
return ConfWriter_get_charmony_fh();
}
-static char charm_h_code[] =
+static const char charm_h_code[] =
QUOTE( #ifndef CHARM_H )
QUOTE( #define CHARM_H 1 )
QUOTE( #include <stdio.h> )
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/AtomicOps.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/AtomicOps.c?rev=1134845&r1=1134844&r2=1134845&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/AtomicOps.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/AtomicOps.c Sun Jun 12 00:28:57 2011
@@ -25,7 +25,7 @@
#include <stdio.h>
#include <stdlib.h>
-static char osatomic_casptr_code[] =
+static const char osatomic_casptr_code[] =
QUOTE( #include <libkern/OSAtomic.h> )
QUOTE( #include <libkern/OSAtomic.h> )
QUOTE( int main() { )
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.c?rev=1134845&r1=1134844&r2=1134845&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.c Sun Jun 12 00:28:57 2011
@@ -25,7 +25,7 @@
#include <stdlib.h>
/* Code for verifying ISO func macro. */
-static char iso_func_code[] =
+static const char iso_func_code[] =
QUOTE( #include "_charm.h" )
QUOTE( int main() { )
QUOTE( Charm_Setup; )
@@ -34,7 +34,7 @@ static char iso_func_code[] =
QUOTE( } );
/* Code for verifying GNU func macro. */
-static char gnuc_func_code[] =
+static const char gnuc_func_code[] =
QUOTE( #include "_charm.h" )
QUOTE( int main() { )
QUOTE( Charm_Setup; )
@@ -43,7 +43,7 @@ static char gnuc_func_code[] =
QUOTE( } );
/* Code for verifying inline keyword. */
-static char inline_code[] =
+static const char inline_code[] =
QUOTE( #include "_charm.h" )
QUOTE( static %s int foo() { return 1; } )
QUOTE( int main() { )
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.c?rev=1134845&r1=1134844&r2=1134845&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.c Sun Jun 12 00:28:57 2011
@@ -46,7 +46,7 @@ static void
S_encode_affirmation(const char *header_name);
#define NUM_C89_HEADERS 15
-char *c89_headers[] = {
+const char *c89_headers[] = {
"assert.h",
"ctype.h",
"errno.h",
@@ -66,7 +66,7 @@ char *c89_headers[] = {
};
#define NUM_POSIX_HEADERS 14
-char *posix_headers[] = {
+const char *posix_headers[] = {
"cpio.h",
"dirent.h",
"fcntl.h",
@@ -85,7 +85,7 @@ char *posix_headers[] = {
};
#define NUM_WIN_HEADERS 3
-char *win_headers[] = {
+const char *win_headers[] = {
"io.h",
"windows.h",
"process.h",
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.c?rev=1134845&r1=1134844&r2=1134845&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.c Sun Jun 12 00:28:57 2011
@@ -30,7 +30,7 @@
static chaz_bool_t
S_machine_is_big_endian(void);
-static char sizes_code[] =
+static const char sizes_code[] =
QUOTE( #include "_charm.h" )
QUOTE( int main () { )
QUOTE( Charm_Setup; )
@@ -42,7 +42,7 @@ static char sizes_code[] =
QUOTE( return 0; )
QUOTE( } );
-static char type64_code[] =
+static const char type64_code[] =
QUOTE( #include "_charm.h" )
QUOTE( int main() )
QUOTE( { )
@@ -51,7 +51,7 @@ static char type64_code[] =
QUOTE( return 0; )
QUOTE( } );
-static char literal64_code[] =
+static const char literal64_code[] =
QUOTE( #include "_charm.h" )
QUOTE( #define big 9000000000000000000%s )
QUOTE( int main() )
@@ -323,7 +323,7 @@ Integers_run(void) {
/* Create the I64P and U64P printf macros. */
if (has_64) {
int i;
- char *options[] = {
+ const char *options[] = {
"ll",
"l",
"L",
@@ -333,7 +333,7 @@ Integers_run(void) {
};
/* Buffer to hold the code, and its start and end. */
- static char format_64_code[] =
+ static const char format_64_code[] =
QUOTE( #include "_charm.h" )
QUOTE( int main() { )
QUOTE( Charm_Setup; )
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.c?rev=1134845&r1=1134844&r2=1134845&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.c Sun Jun 12 00:28:57 2011
@@ -192,7 +192,7 @@ LargeFiles_run(void) {
}
/* Code for checking ftello64 and friends. */
-static char off64_code[] =
+static const char off64_code[] =
QUOTE( %s )
QUOTE( #include "_charm.h" )
QUOTE( int main() { )
@@ -244,7 +244,7 @@ S_probe_off64(off64_combo *combo) {
}
/* Code for checking 64-bit lseek. */
-static char lseek_code[] =
+static const char lseek_code[] =
QUOTE( %s )
QUOTE( #include "_charm.h" )
QUOTE( int main() { )
@@ -287,7 +287,7 @@ S_probe_lseek(unbuff_combo *combo) {
/* Code for checking 64-bit pread. The pread call will fail, but that's fine
* as long as it compiles. */
-static char pread64_code[] =
+static const char pread64_code[] =
QUOTE( %s )
QUOTE( #include "_charm.h" )
QUOTE( int main() { )
@@ -381,7 +381,7 @@ S_test_sparse_file(long offset, Stat *st
}
/* Open a file, seek to a loc, print a char, and communicate success. */
-static char create_bigfile_code[] =
+static const char create_bigfile_code[] =
QUOTE( #include "_charm.h" )
QUOTE( int main() { )
QUOTE( FILE *fh = fopen("_charm_large_file_test", "w+"); )
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/Memory.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/Memory.c?rev=1134845&r1=1134844&r2=1134845&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/Memory.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/Memory.c Sun Jun 12 00:28:57 2011
@@ -25,7 +25,7 @@
#include <stdio.h>
#include <stdlib.h>
-static char alloca_code[] =
+static const char alloca_code[] =
"#include <%s>\n"
QUOTE( int main() { )
QUOTE( void *foo = %s(1); )
@@ -49,7 +49,7 @@ Memory_run(void) {
/* OpenBSD needs sys/types.h for sys/mman.h to work and mmap() to be
* available. Everybody else that has sys/mman.h should have
* sys/types.h as well. */
- char *mman_headers[] = {
+ const char *mman_headers[] = {
"sys/types.h",
"sys/mman.h",
NULL
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.c?rev=1134845&r1=1134844&r2=1134845&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.c Sun Jun 12 00:28:57 2011
@@ -25,7 +25,7 @@
/* Code for verifying ISO-style variadic macros. */
-static char iso_code[] =
+static const char iso_code[] =
QUOTE( #include "_charm.h" )
QUOTE( #define ISO_TEST(fmt, ...) \\ )
" printf(fmt, __VA_ARGS__) \n"
@@ -36,7 +36,7 @@ static char iso_code[] =
QUOTE( } );
/* Code for verifying GNU-style variadic macros. */
-static char gnuc_code[] =
+static const char gnuc_code[] =
QUOTE( #include "_charm.h" )
QUOTE( #define GNU_TEST(fmt, args...) printf(fmt, ##args) )
QUOTE( int main() { )
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestFuncMacro.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestFuncMacro.c?rev=1134845&r1=1134844&r2=1134845&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestFuncMacro.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestFuncMacro.c Sun Jun 12 00:28:57 2011
@@ -21,7 +21,7 @@
#include "Charmonizer/Test.h"
#ifdef INLINE
-static INLINE char* S_inline_function() {
+static INLINE const char* S_inline_function() {
return "inline works";
}
#endif