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 2006/11/04 01:20:13 UTC
svn commit: r471064 - in /lucene/lucy/trunk/charmonizer: ./
src/Charmonizer/Core/ src/Charmonizer/Probe/
Author: marvin
Date: Fri Nov 3 16:20:12 2006
New Revision: 471064
URL: http://svn.apache.org/viewvc?view=rev&rev=471064
Log:
Remove the last vestiges of the conf_fh from the Probe modules. Remove it as
an argument to the ModuleName_run functions, plus the newly recapitalized
START_RUN and END_RUN.
Modified:
lucene/lucy/trunk/charmonizer/charmonize.c
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.harm
Modified: lucene/lucy/trunk/charmonizer/charmonize.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/charmonize.c?view=diff&rev=471064&r1=471063&r2=471064
==============================================================================
--- lucene/lucy/trunk/charmonizer/charmonize.c (original)
+++ lucene/lucy/trunk/charmonizer/charmonize.c Fri Nov 3 16:20:12 2006
@@ -52,12 +52,12 @@
FILE *config_fh = init(argc, argv);
/* modules section */
- chaz_Headers_run(config_fh);
- chaz_FuncMacro_run(config_fh);
- chaz_Integers_run(config_fh);
- chaz_LargeFiles_run(config_fh);
- chaz_UnusedVars_run(config_fh);
- chaz_VariadicMacros_run(config_fh);
+ chaz_Headers_run();
+ chaz_FuncMacro_run();
+ chaz_Integers_run();
+ chaz_LargeFiles_run();
+ chaz_UnusedVars_run();
+ chaz_VariadicMacros_run();
/* write tail of config and clean up */
finish_conf_file(config_fh);
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.harm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.harm?view=diff&rev=471064&r1=471063&r2=471064
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.harm Fri Nov 3 16:20:12 2006
@@ -62,12 +62,12 @@
/* Print bookends delimiting a short names block.
*/
-#define Chaz_ModHand_Start_Short_Names(conf_fh) \
+#define CHAZ_MODHAND_START_SHORT_NAMES \
append_conf( \
"\n#if defined(%sUSE_SHORT_NAMES) || defined(CHAZ_USE_SHORT_NAMES)\n", \
chaz_ModHand_constant_prefix)
-#define Chaz_ModHand_End_Short_Names(conf_fh) \
+#define CHAZ_MODHAND_END_SHORT_NAMES \
append_conf( \
"#endif /* USE_SHORT_NAMES */\n", chaz_ModHand_constant_prefix)
@@ -127,8 +127,8 @@
# define ModHand_init chaz_ModHand_init
# define write_charm_h chaz_ModHand_write_charm_h
# define build_charm_run chaz_ModHand_build_charm_run
-# define Start_Short_Names Chaz_ModHand_Start_Short_Names
-# define End_Short_Names Chaz_ModHand_End_Short_Names
+# define START_SHORT_NAMES CHAZ_MODHAND_START_SHORT_NAMES
+# define END_SHORT_NAMES CHAZ_MODHAND_END_SHORT_NAMES
# define test_compile chaz_ModHand_test_compile
# define capture_output chaz_ModHand_capture_output
# define append_conf chaz_ModHand_append_conf
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.charm?view=diff&rev=471064&r1=471063&r2=471064
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.charm Fri Nov 3 16:20:12 2006
@@ -28,7 +28,7 @@
void
-chaz_FuncMacro_run(FILE *conf_fh)
+chaz_FuncMacro_run(void)
{
char *output;
size_t output_len;
@@ -76,7 +76,7 @@
}
if (want_short_names) {
- Start_Short_Names(conf_fh);
+ START_SHORT_NAMES;
if (has_iso_funcmac)
shorten_constant("HAS_ISO_FUNC_MACRO");
if (has_gnuc_funcmac)
@@ -85,7 +85,7 @@
shorten_constant("HAS_FUNC_MACRO");
shorten_macro("Func_Macro");
}
- End_Short_Names(conf_fh);
+ END_SHORT_NAMES;
}
END_RUN;
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.harm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.harm?view=diff&rev=471064&r1=471063&r2=471064
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.harm Fri Nov 3 16:20:12 2006
@@ -8,7 +8,7 @@
/* Run the FuncMacro module.
*/
-void chaz_FuncMacro_run(FILE *conf_fh);
+void chaz_FuncMacro_run(void);
#ifdef CHAZ_USE_SHORT_NAMES
# define FuncMacro_run chaz_FuncMacro_run
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.charm?view=diff&rev=471064&r1=471063&r2=471064
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.charm Fri Nov 3 16:20:12 2006
@@ -71,7 +71,7 @@
}
void
-chaz_Headers_run(FILE *conf_fh)
+chaz_Headers_run(void)
{
int i;
chaz_bool_t has_posix = false;
@@ -105,7 +105,7 @@
}
if (want_short_names) {
- Start_Short_Names(conf_fh);
+ START_SHORT_NAMES;
if (has_posix)
shorten_constant("HAS_POSIX");
@@ -120,7 +120,7 @@
shorten_constant(aff_buf);
}
- End_Short_Names(conf_fh);
+ END_SHORT_NAMES;
}
END_RUN;
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.harm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.harm?view=diff&rev=471064&r1=471063&r2=471064
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.harm Fri Nov 3 16:20:12 2006
@@ -62,7 +62,7 @@
* HAS_UTIME_H
*/
void
-chaz_Headers_run(FILE *conf_fh);
+chaz_Headers_run(void);
#ifdef CHAZ_USE_SHORT_NAMES
# define Headers_run chaz_Headers_run
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.charm?view=diff&rev=471064&r1=471063&r2=471064
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.charm Fri Nov 3 16:20:12 2006
@@ -59,7 +59,7 @@
METAQUOTE;
void
-chaz_Integers_run(FILE *conf_fh)
+chaz_Integers_run(void)
{
char *output;
size_t output_len;
@@ -354,7 +354,7 @@
);
if (want_short_names) {
- Start_Short_Names(conf_fh);
+ START_SHORT_NAMES;
if (machine_is_big_endian())
shorten_constant("BIG_END");
@@ -421,7 +421,7 @@
shorten_macro("U64_C");
}
- End_Short_Names(conf_fh);
+ END_SHORT_NAMES;
}
END_RUN;
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.harm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.harm?view=diff&rev=471064&r1=471063&r2=471064
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.harm Fri Nov 3 16:20:12 2006
@@ -95,7 +95,7 @@
/* Run the Integers module.
*/
-void chaz_Integers_run(FILE *conf_fh);
+void chaz_Integers_run(void);
#ifdef CHAZ_USE_SHORT_NAMES
# define Integers_run chaz_Integers_run
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.charm?view=diff&rev=471064&r1=471063&r2=471064
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.charm Fri Nov 3 16:20:12 2006
@@ -53,7 +53,7 @@
static char loff_type[10];
void
-chaz_LargeFiles_run(FILE *conf_fh)
+chaz_LargeFiles_run(void)
{
chaz_bool_t success = false;
unsigned i;
@@ -101,7 +101,7 @@
/* short names */
if (want_short_names && success) {
- Start_Short_Names(conf_fh);
+ START_SHORT_NAMES;
shorten_constant("HAS_LARGE_FILE_SUPPORT");
/* alias these only if they're not already provided and correct */
@@ -110,7 +110,7 @@
shorten_function("ftello64");
shorten_function("fseeko64");
}
- End_Short_Names(conf_fh);
+ END_SHORT_NAMES;
}
free(code_buf);
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.harm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.harm?view=diff&rev=471064&r1=471063&r2=471064
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.harm Fri Nov 3 16:20:12 2006
@@ -19,7 +19,7 @@
*
* Use of the off64_t symbol may require sys/types.h.
*/
-void chaz_LargeFiles_run(FILE *conf_fh);
+void chaz_LargeFiles_run(void);
#ifdef CHAZ_USE_SHORT_NAMES
# define LargeFiles_run chaz_LargeFiles_run
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.charm?view=diff&rev=471064&r1=471063&r2=471064
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.charm Fri Nov 3 16:20:12 2006
@@ -8,7 +8,7 @@
void
-chaz_UnusedVars_run(FILE *conf_fh)
+chaz_UnusedVars_run(void)
{
START_RUN("UnusedVars");
@@ -19,10 +19,10 @@
);
if (want_short_names) {
- Start_Short_Names(conf_fh);
+ START_SHORT_NAMES;
shorten_macro("Unused_Var");
shorten_macro("Unreachable_Return");
- End_Short_Names(conf_fh);
+ END_SHORT_NAMES;
}
END_RUN;
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.harm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.harm?view=diff&rev=471064&r1=471063&r2=471064
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.harm Fri Nov 3 16:20:12 2006
@@ -8,7 +8,7 @@
/* Run the UnusedVars module.
*/
-void chaz_UnusedVars_run(FILE *conf_fh);
+void chaz_UnusedVars_run(void);
#ifdef CHAZ_USE_SHORT_NAMES
# define UnusedVars_run chaz_UnusedVars_run
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.charm?view=diff&rev=471064&r1=471063&r2=471064
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.charm Fri Nov 3 16:20:12 2006
@@ -30,7 +30,7 @@
METAQUOTE;
void
-chaz_VariadicMacros_run(FILE *conf_fh)
+chaz_VariadicMacros_run(void)
{
char *output;
size_t output_len;
@@ -65,14 +65,14 @@
}
if (want_short_names) {
- Start_Short_Names(conf_fh);
+ START_SHORT_NAMES;
if (has_varmacros)
shorten_constant("HAS_VARIADIC_MACROS");
if (has_iso_varmacros)
shorten_constant("HAS_ISO_VARIADIC_MACROS");
if (has_gnuc_varmacros)
shorten_constant("HAS_GNUC_VARIADIC_MACROS");
- End_Short_Names(conf_fh);
+ END_SHORT_NAMES;
}
END_RUN;
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.harm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.harm?view=diff&rev=471064&r1=471063&r2=471064
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.harm Fri Nov 3 16:20:12 2006
@@ -8,7 +8,7 @@
/* Run the VariadicMacros module.
*/
-void chaz_VariadicMacros_run(FILE *conf_fh);
+void chaz_VariadicMacros_run(void);
#ifdef CHAZ_USE_SHORT_NAMES
# define VariadicMacros_run chaz_VaradicMacros_run