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/10/16 02:40:37 UTC

svn commit: r464334 - in /lucene/lucy/trunk/charmonizer/src/Charmonizer: Core.charm Integers.charm LargeFiles.charm VariadicMacros.charm

Author: marvin
Date: Sun Oct 15 17:40:34 2006
New Revision: 464334

URL: http://svn.apache.org/viewvc?view=rev&rev=464334
Log:
Remove a few unused vars and a useless null, add a couple explicit #include
directives.

Modified:
    lucene/lucy/trunk/charmonizer/src/Charmonizer/Core.charm
    lucene/lucy/trunk/charmonizer/src/Charmonizer/Integers.charm
    lucene/lucy/trunk/charmonizer/src/Charmonizer/LargeFiles.charm
    lucene/lucy/trunk/charmonizer/src/Charmonizer/VariadicMacros.charm

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Core.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Core.charm?view=diff&rev=464334&r1=464333&r2=464334
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Core.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Core.charm Sun Oct 15 17:40:34 2006
@@ -20,8 +20,8 @@
 capture_output(char *source, size_t source_len, size_t *output_len) 
 {
     char *captured_output = NULL;
-    FILE *app_source_fh, *targ_fh, *garbage_fh;
-    int   command_len = 0;
+    FILE *app_source_fh, *garbage_fh;
+    size_t command_len = 0;
     int   successful;
     
     /* clear out previous versions and test to make sure removal worked */
@@ -56,7 +56,7 @@
      * yet be able to recover it later, so we're stuck seeing the
      * errors when something fails.
      */
-    sprintf(command_buf, "%s " TRY_SOURCE_PATH " -o " TRY_APP_PATH " %s\0", 
+    sprintf(command_buf, "%s " TRY_SOURCE_PATH " -o " TRY_APP_PATH " %s", 
         compiler, ccflags);
     system(command_buf);
 

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Integers.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Integers.charm?view=diff&rev=464334&r1=464333&r2=464334
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Integers.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Integers.charm Sun Oct 15 17:40:34 2006
@@ -4,6 +4,7 @@
 #include "Charmonizer/Integers.h"
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 static char sizes_code[] = 
     METAQUOTE

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/LargeFiles.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/LargeFiles.charm?view=diff&rev=464334&r1=464333&r2=464334
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/LargeFiles.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/LargeFiles.charm Sun Oct 15 17:40:34 2006
@@ -3,6 +3,7 @@
 #include "Charmonizer/Core.h"
 #include "Charmonizer/LargeFiles.h"
 #include <string.h>
+#include <stdlib.h>
 #include <stdio.h>
 
 static char ftello_code[] = METAQUOTE

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/VariadicMacros.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/VariadicMacros.charm?view=diff&rev=464334&r1=464333&r2=464334
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/VariadicMacros.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/VariadicMacros.charm Sun Oct 15 17:40:34 2006
@@ -34,8 +34,6 @@
     char *output;
     size_t output_len;
     chaz_bool_t has_varmacros      = false;
-    chaz_bool_t has_iso_varmacros  = false;
-    chaz_bool_t has_gnuc_varmacros = false;
 
     Start_Run(conf_fh);