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/07/01 08:17:34 UTC
[lucy-commits] svn commit: r1141826 - in /incubator/lucy/branches/0.1: ./
charmonizer/src/Charmonizer/Core/ConfWriter.c
charmonizer/src/Charmonizer/Core/Stat.c
charmonizer/src/Charmonizer/Core/Stat.h charmonizer/src/Charmonizer/Probe.c
Author: marvin
Date: Fri Jul 1 06:17:33 2011
New Revision: 1141826
URL: http://svn.apache.org/viewvc?rev=1141826&view=rev
Log:
LUCY-169 Clarify cleanup responsibility.
Have the modules which wrote the files be responsible for removing them as
well.
Modified:
incubator/lucy/branches/0.1/ (props changed)
incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/ConfWriter.c
incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Stat.c
incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Stat.h
incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Probe.c
Propchange: incubator/lucy/branches/0.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 1 06:17:33 2011
@@ -1 +1 @@
-/incubator/lucy/trunk:1126586,1134011,1134355,1134472,1134843-1134848,1134953,1134956,1139709,1139711,1139714,1140001,1140287,1140296,1140387,1140393,1140400,1140418,1140420,1140422,1140437,1140440,1140894,1140964
+/incubator/lucy/trunk:1126586,1134011,1134355,1134472,1134843-1134848,1134953,1134956,1139709,1139711,1139714,1140001,1140287,1140296,1140387,1140393,1140400,1140418,1140420,1140422,1140437,1140440,1140894,1140924,1140964
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=1141826&r1=1141825&r2=1141826&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 Fri Jul 1 06:17:33 2011
@@ -63,10 +63,6 @@ ConfWriter_get_charmony_fh(void) {
void
ConfWriter_clean_up(void) {
- /* Clean up some temp files. */
- remove("_charm.h");
- OS_remove_exe("_charm_stat");
-
/* Write the last bit of charmony.h and close. */
fprintf(charmony_fh, "#endif /* H_CHARMONY */\n\n");
if (fclose(charmony_fh)) {
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=1141826&r1=1141825&r2=1141826&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 Fri Jul 1 06:17:33 2011
@@ -97,5 +97,8 @@ S_init(void) {
remove("_charm_stat.c");
}
-
+void
+Stat_clean_up(void) {
+ OS_remove_exe("_charm_stat");
+}
Modified: incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Stat.h
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Stat.h?rev=1141826&r1=1141825&r2=1141826&view=diff
==============================================================================
--- incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Stat.h (original)
+++ incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Core/Stat.h Fri Jul 1 06:17:33 2011
@@ -50,9 +50,13 @@ struct chaz_Stat {
void
chaz_Stat_stat(const char *filepath, chaz_Stat *target);
+void
+chaz_Stat_clean_up(void);
+
#ifdef CHAZ_USE_SHORT_NAMES
#define Stat chaz_Stat
#define Stat_stat chaz_Stat_stat
+ #define Stat_clean_up chaz_Stat_clean_up
#endif
#ifdef __cplusplus
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=1141826&r1=1141825&r2=1141826&view=diff
==============================================================================
--- incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Probe.c (original)
+++ incubator/lucy/branches/0.1/charmonizer/src/Charmonizer/Probe.c Fri Jul 1 06:17:33 2011
@@ -26,12 +26,16 @@
#include "Charmonizer/Core/Util.h"
#include "Charmonizer/Core/Compiler.h"
#include "Charmonizer/Core/OperatingSystem.h"
+#include "Charmonizer/Core/Stat.h"
/* Write the "_charm.h" file used by every probe.
*/
static void
S_write_charm_h(void);
+static void
+S_remove_charm_h(void);
+
void
Probe_init(const char *cc_command, const char *cc_flags,
const char *charmony_start) {
@@ -51,7 +55,9 @@ Probe_clean_up(void) {
if (Util_verbosity) { printf("Cleaning up...\n"); }
/* Dispatch various clean up routines. */
+ S_remove_charm_h();
ConfWriter_clean_up();
+ Stat_clean_up();
CC_clean_up();
OS_clean_up();
Dir_clean_up();
@@ -81,4 +87,8 @@ S_write_charm_h(void) {
Util_write_file("_charm.h", charm_h_code);
}
+static void
+S_remove_charm_h(void) {
+ remove("_charm.h");
+}