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/19 20:38:44 UTC
[lucy-commits] svn commit: r1137405 - in /incubator/lucy/branches/0.1: ./
charmonizer/src/Charmonizer/ charmonizer/src/Charmonizer/Core/
charmonizer/src/Charmonizer/Probe/
Author: marvin
Date: Sun Jun 19 18:38:43 2011
New Revision: 1137405
URL: http://svn.apache.org/viewvc?rev=1137405&view=rev
Log:
LUCY-156 Tighten 0-arg function signatures.
Avoid the ambiguity of function declarations with no arguments by inserting
"void".
Modified:
incubator/lucy/branches/0.1/ (props changed)
incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Compiler.c
incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Compiler.h
incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/ConfWriter.c
incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/ConfWriter.h
incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Dir.c
incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/HeaderChecker.c
incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/HeaderChecker.h
incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/OperatingSystem.c
incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Stat.c
incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Probe.c
incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Probe.h
incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Probe/Integers.c
incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Probe/LargeFiles.c
Propchange: incubator/lucy/branches/0.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 19 18:38:43 2011
@@ -1 +1 @@
-/incubator/lucy/trunk:1134011,1134355,1134472
+/incubator/lucy/trunk:1134011,1134355,1134472,1134843
Modified: incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Compiler.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Compiler.c?rev=1137405&r1=1137404&r2=1137405&view=diff
==============================================================================
--- incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Compiler.c (original)
+++ incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Compiler.c Sun Jun 19 18:38:43 2011
@@ -53,10 +53,10 @@ static char *exe_flag = "-o ";
/* Clean up the files associated with CC_capture_output().
*/
static void
-S_clean_up_try();
+S_clean_up_try(void);
static void
-S_do_test_compile();
+S_do_test_compile(void);
void
CC_init(const char *compiler_command, const char *compiler_flags) {
@@ -85,7 +85,7 @@ CC_init(const char *compiler_command, co
}
void
-CC_clean_up() {
+CC_clean_up(void) {
char **dirs;
for (dirs = inc_dirs; *dirs != NULL; dirs++) {
@@ -98,7 +98,7 @@ CC_clean_up() {
}
static char*
-S_inc_dir_string() {
+S_inc_dir_string(void) {
size_t needed = 0;
char *inc_dir_string;
char **dirs;
@@ -256,14 +256,14 @@ CC_capture_output(char *source, size_t s
}
static void
-S_clean_up_try() {
+S_clean_up_try(void) {
remove(TRY_SOURCE_PATH);
OS_remove_exe(TRY_APP_BASENAME);
remove(TARGET_PATH);
}
static void
-S_do_test_compile() {
+S_do_test_compile(void) {
char *code = "int main() { return 0; }\n";
chaz_bool_t success;
Modified: incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Compiler.h
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Compiler.h?rev=1137405&r1=1137404&r2=1137405&view=diff
==============================================================================
--- incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Compiler.h (original)
+++ incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Compiler.h Sun Jun 19 18:38:43 2011
@@ -69,7 +69,7 @@ chaz_CC_init(const char *cc_command, con
/* Clean up the environment.
*/
void
-chaz_CC_clean_up();
+chaz_CC_clean_up(void);
#ifdef CHAZ_USE_SHORT_NAMES
#define CC_compile_exe chaz_CC_compile_exe
Modified: incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/ConfWriter.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/ConfWriter.c?rev=1137405&r1=1137404&r2=1137405&view=diff
==============================================================================
--- incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/ConfWriter.c (original)
+++ incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/ConfWriter.c Sun Jun 19 18:38:43 2011
@@ -30,7 +30,7 @@
static FILE *charmony_fh = NULL;
void
-ConfWriter_init() {
+ConfWriter_init(void) {
return;
}
Modified: incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/ConfWriter.h
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/ConfWriter.h?rev=1137405&r1=1137404&r2=1137405&view=diff
==============================================================================
--- incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/ConfWriter.h (original)
+++ incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/ConfWriter.h Sun Jun 19 18:38:43 2011
@@ -32,7 +32,7 @@ extern "C" {
* else, but after os and compiler are initialized.
*/
void
-chaz_ConfWriter_init();
+chaz_ConfWriter_init(void);
/* Open the charmony.h file handle. Print supplied text to it, if non-null.
* Print an explanatory comment and open the include guard.
Modified: incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Dir.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Dir.c?rev=1137405&r1=1137404&r2=1137405&view=diff
==============================================================================
--- incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Dir.c (original)
+++ incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Dir.c Sun Jun 19 18:38:43 2011
@@ -87,7 +87,7 @@ S_try_init_posix_mkdir(char *header) {
}
static chaz_bool_t
-S_try_init_win_mkdir() {
+S_try_init_win_mkdir(void) {
mkdir_available = CC_compile_exe("_charm_mkdir.c", "_charm_mkdir",
win_mkdir_code, strlen(win_mkdir_code));
if (mkdir_available) {
@@ -98,7 +98,7 @@ S_try_init_win_mkdir() {
}
static void
-S_init_mkdir() {
+S_init_mkdir(void) {
if (Util_verbosity) {
printf("Attempting to compile _charm_mkdir utility...\n");
}
@@ -123,7 +123,7 @@ S_try_init_rmdir(char *header) {
}
static void
-S_init_rmdir() {
+S_init_rmdir(void) {
if (Util_verbosity) {
printf("Attempting to compile _charm_rmdir utility...\n");
}
Modified: incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/HeaderChecker.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/HeaderChecker.c?rev=1137405&r1=1137404&r2=1137405&view=diff
==============================================================================
--- incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/HeaderChecker.c (original)
+++ incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/HeaderChecker.c Sun Jun 19 18:38:43 2011
@@ -60,7 +60,7 @@ static void
S_maybe_add_to_cache(const char *header_name, chaz_bool_t exists);
void
-HeadCheck_init() {
+HeadCheck_init(void) {
Header *null_header = (Header*)malloc(sizeof(Header));
/* Create terminating record for the dynamic array of Header objects. */
Modified: incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/HeaderChecker.h
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/HeaderChecker.h?rev=1137405&r1=1137404&r2=1137405&view=diff
==============================================================================
--- incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/HeaderChecker.h (original)
+++ incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/HeaderChecker.h Sun Jun 19 18:38:43 2011
@@ -29,7 +29,7 @@ extern "C" {
/* Bootstrap the HeadCheck. Call this before anything else.
*/
void
-chaz_HeadCheck_init();
+chaz_HeadCheck_init(void);
/* Check for a particular header and return true if it's available. The
* test-compile is only run the first time a given request is made.
Modified: incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/OperatingSystem.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/OperatingSystem.c?rev=1137405&r1=1137404&r2=1137405&view=diff
==============================================================================
--- incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/OperatingSystem.c (original)
+++ incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/OperatingSystem.c Sun Jun 19 18:38:43 2011
@@ -44,13 +44,13 @@ S_probe_dev_null(void);
* to dev_null.
*/
static void
-S_build_charm_run();
+S_build_charm_run(void);
static chaz_bool_t charm_run_initialized = false;
static chaz_bool_t charm_run_ok = false;
void
-OS_init() {
+OS_init(void) {
if (Util_verbosity) {
printf("Initializing Charmonizer/Core/OperatingSystem...\n");
}
@@ -142,7 +142,7 @@ static char charm_run_code[] =
QUOTE( } );
static void
-S_build_charm_run() {
+S_build_charm_run(void) {
chaz_bool_t compile_succeeded = false;
const char *dev_null = OS_dev_null();
size_t needed = sizeof(charm_run_code)
Modified: incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Stat.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Stat.c?rev=1137405&r1=1137404&r2=1137405&view=diff
==============================================================================
--- incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Stat.c (original)
+++ incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Stat.c Sun Jun 19 18:38:43 2011
@@ -32,7 +32,7 @@ static chaz_bool_t stat_available = fals
/* Lazily compile _charm_stat. */
static void
-S_init();
+S_init(void);
void
Stat_stat(const char *filepath, Stat *target) {
@@ -81,7 +81,7 @@ static char charm_stat_code[] =
QUOTE( } );
static void
-S_init() {
+S_init(void) {
/* Only try this once. */
initialized = true;
if (Util_verbosity) {
Modified: incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Probe.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Probe.c?rev=1137405&r1=1137404&r2=1137405&view=diff
==============================================================================
--- incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Probe.c (original)
+++ incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Probe.c Sun Jun 19 18:38:43 2011
@@ -30,7 +30,7 @@
/* Write the "_charm.h" file used by every probe.
*/
static void
-S_write_charm_h();
+S_write_charm_h(void);
void
Probe_init(const char *cc_command, const char *cc_flags,
@@ -47,7 +47,7 @@ Probe_init(const char *cc_command, const
}
void
-Probe_clean_up() {
+Probe_clean_up(void) {
if (Util_verbosity) { printf("Cleaning up...\n"); }
/* Dispatch various clean up routines. */
@@ -77,7 +77,7 @@ static char charm_h_code[] =
QUOTE( #endif );
static void
-S_write_charm_h() {
+S_write_charm_h(void) {
Util_write_file("_charm.h", charm_h_code);
}
Modified: incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Probe.h
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Probe.h?rev=1137405&r1=1137404&r2=1137405&view=diff
==============================================================================
--- incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Probe.h (original)
+++ incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Probe.h Sun Jun 19 18:38:43 2011
@@ -39,7 +39,7 @@ chaz_Probe_init(const char *cc_command,
* should be called only after everything else finishes.
*/
void
-chaz_Probe_clean_up();
+chaz_Probe_clean_up(void);
/* Determine how much feedback Charmonizer provides.
* 0 - silent
Modified: incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Probe/Integers.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Probe/Integers.c?rev=1137405&r1=1137404&r2=1137405&view=diff
==============================================================================
--- incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Probe/Integers.c (original)
+++ incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Probe/Integers.c Sun Jun 19 18:38:43 2011
@@ -28,7 +28,7 @@
/* Determine endian-ness of this machine.
*/
static chaz_bool_t
-S_machine_is_big_endian();
+S_machine_is_big_endian(void);
static char sizes_code[] =
QUOTE( #include "_charm.h" )
@@ -471,7 +471,7 @@ Integers_run(void) {
}
static chaz_bool_t
-S_machine_is_big_endian() {
+S_machine_is_big_endian(void) {
long one = 1;
return !(*((char*)(&one)));
}
Modified: incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Probe/LargeFiles.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Probe/LargeFiles.c?rev=1137405&r1=1137404&r2=1137405&view=diff
==============================================================================
--- incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Probe/LargeFiles.c (original)
+++ incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Probe/LargeFiles.c Sun Jun 19 18:38:43 2011
@@ -75,7 +75,7 @@ S_probe_pread64(unbuff_combo *combo);
/* Determine whether we can use sparse files.
*/
static chaz_bool_t
-S_check_sparse_files();
+S_check_sparse_files(void);
/* Helper for check_sparse_files().
*/
@@ -86,7 +86,7 @@ S_test_sparse_file(long offset, Stat *st
* doesn't, then the test suite can safely verify large file support.
*/
static chaz_bool_t
-S_can_create_big_files();
+S_can_create_big_files(void);
/* Vars for holding lfs commands, once they're discovered. */
static char fopen_command[10];
@@ -323,7 +323,7 @@ S_probe_pread64(unbuff_combo *combo) {
}
static chaz_bool_t
-S_check_sparse_files() {
+S_check_sparse_files(void) {
Stat st_a, st_b;
/* Bail out if we can't stat() a file. */
@@ -402,7 +402,7 @@ static char create_bigfile_code[] =
QUOTE( } );
static chaz_bool_t
-S_can_create_big_files() {
+S_can_create_big_files(void) {
char *output;
size_t output_len;
FILE *truncating_fh;