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 2012/06/14 19:18:24 UTC
[lucy-commits] svn commit: r1350342 - in /lucy/trunk/charmonizer/src/Charmonizer:
Core/ConfWriter.c Core/ConfWriter.h Probe.c Probe.h
Author: marvin
Date: Thu Jun 14 17:18:23 2012
New Revision: 1350342
URL: http://svn.apache.org/viewvc?rev=1350342&view=rev
Log:
Remove accessor for charmony.h filehandle.
Modified:
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/src/Charmonizer/Core/ConfWriter.c
URL: http://svn.apache.org/viewvc/lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.c?rev=1350342&r1=1350341&r2=1350342&view=diff
==============================================================================
--- lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.c (original)
+++ lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.c Thu Jun 14 17:18:23 2012
@@ -80,11 +80,6 @@ ConfWriter_open_charmony_h(const char *c
);
}
-FILE*
-ConfWriter_get_charmony_fh(void) {
- return charmony_fh;
-}
-
void
ConfWriter_clean_up(void) {
/* Write the last bit of charmony.h and close. */
Modified: lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.h
URL: http://svn.apache.org/viewvc/lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.h?rev=1350342&r1=1350341&r2=1350342&view=diff
==============================================================================
--- lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.h (original)
+++ lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.h Thu Jun 14 17:18:23 2012
@@ -24,7 +24,6 @@
extern "C" {
#endif
-#include <stdio.h>
#include <stddef.h>
#include "Charmonizer/Core/Defines.h"
@@ -40,11 +39,6 @@ chaz_ConfWriter_init(void);
void
chaz_ConfWriter_open_charmony_h(const char *charmony_start);
-/* Return the config file's file handle.
- */
-FILE*
-chaz_ConfWriter_get_charmony_fh(void);
-
/* Close the include guard on charmony.h, then close the file. Delete temp
* files and perform any other needed cleanup.
*/
@@ -114,7 +108,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_get_charmony_fh chaz_ConfWriter_get_charmony_fh
#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=1350342&r1=1350341&r2=1350342&view=diff
==============================================================================
--- lucy/trunk/charmonizer/src/Charmonizer/Probe.c (original)
+++ lucy/trunk/charmonizer/src/Charmonizer/Probe.c Thu Jun 14 17:18:23 2012
@@ -66,11 +66,6 @@ Probe_clean_up(void) {
if (Util_verbosity) { printf("Cleanup complete.\n"); }
}
-FILE*
-Probe_get_charmony_fh(void) {
- return ConfWriter_get_charmony_fh();
-}
-
static const char charm_h_code[] =
QUOTE( #ifndef CHARM_H )
QUOTE( #define CHARM_H 1 )
Modified: lucy/trunk/charmonizer/src/Charmonizer/Probe.h
URL: http://svn.apache.org/viewvc/lucy/trunk/charmonizer/src/Charmonizer/Probe.h?rev=1350342&r1=1350341&r2=1350342&view=diff
==============================================================================
--- lucy/trunk/charmonizer/src/Charmonizer/Probe.h (original)
+++ lucy/trunk/charmonizer/src/Charmonizer/Probe.h Thu Jun 14 17:18:23 2012
@@ -48,17 +48,9 @@ chaz_Probe_init(const char *cc_command,
void
chaz_Probe_clean_up(void);
-/* Access the FILE* used to write charmony.h, so that you can write your own
- * content to it. Should not be called before chaz_Probe_init() or after
- * chaz_Probe_clean_up().
- */
-FILE*
-chaz_Probe_get_charmony_fh(void);
-
#ifdef CHAZ_USE_SHORT_NAMES
#define Probe_init chaz_Probe_init
#define Probe_clean_up chaz_Probe_clean_up
- #define Probe_get_charmony_fh chaz_Probe_get_charmony_fh
#endif
#ifdef __cplusplus