From: Eric S. Raymond <esr@thyrsus.com>
Date: Wed, 10 Sep 2003 07:13:27 +0000 (+0000)
Subject: More C normalization.
X-Git-Tag: 1.2~4
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=2a18d3b37772cbf0ff3f2eea65f6043951734d59;p=comparator.git

More C normalization.
---

diff --git a/main.c b/main.c
index e1be40d..f5c0f3b 100644
--- a/main.c
+++ b/main.c
@@ -84,10 +84,10 @@ static void write_scf(const char *tree, FILE *ofp)
     fputs("Generator-Program: comparator 1.0\n", ofp);
     fputs("Hash-Method: MD5\n", ofp);
     buf[0] = '\0';
-    if (rws)
+    if (remove_whitespace)
 	strcat(buf, "remove-whitespace,");
-    if (c_normalization)
-	strcat(buf, "c-normalization,");
+    if (remove_braces)
+	strcat(buf, "remove-braces,");
     if (buf[0])
 	buf[strlen(buf)-1] = '\0';
     else
@@ -361,7 +361,7 @@ main(int argc, char *argv[])
 	    break;
 
 	case 'C':
-	    c_normalization = 1;
+	    remove_braces = 1;
 	    break;
 
 	case 'd':
@@ -377,7 +377,7 @@ main(int argc, char *argv[])
 	    break;
 
 	case 'w':
-	    rws = 1;
+	    remove_whitespace = 1;
 	    break;
 
 	case 'x':
@@ -475,8 +475,19 @@ main(int argc, char *argv[])
     /* if there were no SCFs, create a dummy one */
     if (scf_head == &dummy_scf)
     {
+	char	buf[BUFSIZ];
+
 	dummy_scf.hash_method = "MD5";
-	dummy_scf.normalization = rws ? "remove_whitespace" : "none";
+	buf[0] == '\0';
+	if (remove_whitespace)
+	    strcat(buf, "remove-whitespace,");
+	if (remove_braces)
+	    strcat(buf, "remove-braces,");
+	if (buf[0])
+	    buf[strlen(buf)-1] = '\0';
+	else
+	    strcpy(buf, "none");
+	dummy_scf.normalization = strdup(buf);
 	dummy_scf.shred_size = shredsize;
 	dummy_scf.generator_program = "comparator 1.0";
     }
diff --git a/scf-standard.xml b/scf-standard.xml
index e46df9b..402fc6e 100644
--- a/scf-standard.xml
+++ b/scf-standard.xml
@@ -17,8 +17,16 @@
   </affiliation>
 </author>
 
-<revhistory>
+<revhistory> 
    <revision>
+      <revnumber>1.1</revnumber>
+      <date>2003-10-07</date>
+      <authorinitials>esr</authorinitials>
+       <revremark>
+	 Added remove-braces.
+       </revremark>
+   </revision>
+  <revision>
       <revnumber>1.0</revnumber>
       <date>2003-09-07</date>
       <authorinitials>esr</authorinitials>
@@ -200,11 +208,11 @@ may include the following:</para>
 (spaces, tabs, and linefeeds) has been stripped out.</para>
 </listitem>
 
-<!--
 <listitem>
 <para><emphasis>remove-braces</emphasis>: Remove { and }.</para>
 </listitem>
 
+<!--
 <listitem>
 <para><emphasis>remove-C-comments</emphasis>: Remove /* and */</para>
 </listitem>
diff --git a/shred.h b/shred.h
index dd811b9..548d5ca 100644
--- a/shred.h
+++ b/shred.h
@@ -31,8 +31,8 @@ struct sorthash_t
 };
 
 /* control bits, meant to be set at startup */
-extern int c_normalization;
-extern int rws;
+extern int remove_braces;
+extern int remove_whitespace;
 extern int debug;
 extern int shredsize;
 
diff --git a/shredtree.c b/shredtree.c
index 871df66..2842de5 100644
--- a/shredtree.c
+++ b/shredtree.c
@@ -11,8 +11,8 @@
 #include "shred.h"
 
 /* control bits, meant to be set at startup */
-int c_normalization = 0;
-int rws = 0;
+int remove_braces = 0;
+int remove_whitespace = 0;
 int shredsize = 3;
 
 struct item
@@ -68,7 +68,7 @@ static int eligible(const char *file)
 static int normalize(char *buf)
 /* normalize a buffer in place, return 0 if it should be skipped */
 {
-    if (rws)		/* strip whitespace, ignore blank lines */
+    if (remove_whitespace)	/* strip whitespace, ignore blank lines */
     {
 	char *tp, *sp;
 
@@ -77,7 +77,7 @@ static int normalize(char *buf)
 		*tp++ = *sp;
 	*tp = '\0';
     }
-    if (c_normalization)	/* strip whitespace, ignore blank lines */
+    if (remove_braces)		/* strip C statement brackets */
     {
 	char *tp, *sp;