Author: marvin
Date: Fri Jun 15 15:03:49 2012
New Revision: 1350647
URL: http://svn.apache.org/viewvc?rev=1350647&view=rev
Log:
Hide opening of charmony.h file.
Remove current external API for opening charmony.h and supplying initial
content.
Modified:
lucy/trunk/charmonizer/charmonize.c
lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.c
lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.h
lucy/trunk/charmonizer/src/Charmonizer/Probe.c
lucy/trunk/charmonizer/src/Charmonizer/Probe.h
Modified: lucy/trunk/charmonizer/charmonize.c
URL:
http://svn.apache.org/viewvc/lucy/trunk/charmonizer/charmonize.c?rev=1350647&r1=1350646&r2=1350647&view=diff
==============================================================================
--- lucy/trunk/charmonizer/charmonize.c (original)
+++ lucy/trunk/charmonizer/charmonize.c Fri Jun 15 15:03:49 2012
@@ -45,7 +45,7 @@ int main(int argc, char **argv) {
else {
char *cc_command = argv[1];
char *cc_flags = argv[2];
- chaz_Probe_init(cc_command, cc_flags, NULL);
+ chaz_Probe_init(cc_command, cc_flags);
}
/* Run probe modules. */
Modified: lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.c
URL:
http://svn.apache.org/viewvc/lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.c?rev=1350647&r1=1350646&r2=1350647&view=diff
==============================================================================
--- lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.c (original)
+++ lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.c Fri Jun 15
15:03:49 2012
@@ -45,6 +45,12 @@ static ConfElem *defs = NULL;
static size_t def_cap = 0;
static size_t def_count = 0;
+/* Open the charmony.h file handle. Print supplied text to it, if non-null.
+ * Print an explanatory comment and open the include guard.
+ */
+static void
+S_open_charmony_h(const char *charmony_start);
+
/* Push a new elem onto the def list. */
static void
S_push_def_list_item(const char *str1, const char *str2, ConfElemType type);
@@ -55,11 +61,12 @@ S_clear_def_list(void);
void
ConfWriter_init(void) {
+ S_open_charmony_h(NULL);
return;
}
-void
-ConfWriter_open_charmony_h(const char *charmony_start) {
+static void
+S_open_charmony_h(const char *charmony_start) {
/* Open the filehandle. */
charmony_fh = fopen("charmony.h", "w+");
if (charmony_fh == NULL) {
Modified: lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.h
URL:
http://svn.apache.org/viewvc/lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.h?rev=1350647&r1=1350646&r2=1350647&view=diff
==============================================================================
--- lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.h (original)
+++ lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.h Fri Jun 15
15:03:49 2012
@@ -33,12 +33,6 @@ extern "C" {
void
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.
- */
-void
-chaz_ConfWriter_open_charmony_h(const char *charmony_start);
-
/* Close the include guard on charmony.h, then close the file. Delete temp
* files and perform any other needed cleanup.
*/
@@ -82,7 +76,6 @@ chaz_ConfWriter_end_module(void);
#ifdef CHAZ_USE_SHORT_NAMES
#define ConfWriter_init chaz_ConfWriter_init
- #define ConfWriter_open_charmony_h chaz_ConfWriter_open_charmony_h
#define ConfWriter_clean_up chaz_ConfWriter_clean_up
#define ConfWriter_build_charm_run chaz_ConfWriter_build_charm_run
#define ConfWriter_start_module chaz_ConfWriter_start_module
Modified: lucy/trunk/charmonizer/src/Charmonizer/Probe.c
URL:
http://svn.apache.org/viewvc/lucy/trunk/charmonizer/src/Charmonizer/Probe.c?rev=1350647&r1=1350646&r2=1350647&view=diff
==============================================================================
--- lucy/trunk/charmonizer/src/Charmonizer/Probe.c (original)
+++ lucy/trunk/charmonizer/src/Charmonizer/Probe.c Fri Jun 15 15:03:49 2012
@@ -35,8 +35,7 @@ static void
S_remove_charm_h(void);
void
-Probe_init(const char *cc_command, const char *cc_flags,
- const char *charmony_start) {
+Probe_init(const char *cc_command, const char *cc_flags) {
/* Proces CHARM_VERBOSITY environment variable. */
const char *verbosity_env = getenv("CHARM_VERBOSITY");
if (verbosity_env && strlen(verbosity_env)) {
@@ -48,7 +47,6 @@ Probe_init(const char *cc_command, const
CC_init(cc_command, cc_flags);
ConfWriter_init();
HeadCheck_init();
- ConfWriter_open_charmony_h(charmony_start);
S_write_charm_h();
if (Util_verbosity) { printf("Initialization complete.\n"); }
Modified: lucy/trunk/charmonizer/src/Charmonizer/Probe.h
URL:
http://svn.apache.org/viewvc/lucy/trunk/charmonizer/src/Charmonizer/Probe.h?rev=1350647&r1=1350646&r2=1350647&view=diff
==============================================================================
--- lucy/trunk/charmonizer/src/Charmonizer/Probe.h (original)
+++ lucy/trunk/charmonizer/src/Charmonizer/Probe.h Fri Jun 15 15:03:49 2012
@@ -36,11 +36,9 @@ extern "C" {
*
* @param cc_command the string used to invoke the C compiler via system()
* @param cc_flags flags which will be passed on to the C compiler
- * @param charmony_start Code to prepend onto the front of charmony.h
*/
void
-chaz_Probe_init(const char *cc_command, const char *cc_flags,
- const char *charmony_start);
+chaz_Probe_init(const char *cc_command, const char *cc_flags);
/* Clean up the Charmonizer environment -- deleting tempfiles, etc. This
* should be called only after everything else finishes.
