Clean up the chunk-extension logic.

diff --git a/linebyline.c b/linebyline.c
index e915ef3401487a6b0a88320b0290f23a82809e0c..b3302f3c6d69e0de3f8d67cf737f77f5b317183e 100644 (file)
--- a/linebyline.c
+++ b/linebyline.c
@@ -213,7 +213,7 @@ feature_t *analyzer_get(const struct filehdr_t *file, FILE *fp, linenum_t *linen
     char       buf[BUFSIZ];
     static feature_t   feature;
 
-    while(fgets(buf, sizeof(buf), fp) != NULL)
+    while (fgets(buf, sizeof(buf), fp) != NULL)
     {
        int     braceline = 0;
 
@@ -233,18 +233,7 @@ feature_t *analyzer_get(const struct filehdr_t *file, FILE *fp, linenum_t *linen
            braceline = (*cp == '}');
        }
        if (!normalize(buf))
-       {
-           /*
-            * What this is for is to include trailing C } lines in chunk
-            * listings even though we're ignoring them for comparison 
-            * purposes (in order not to be fooled by variance in indent
-            * styles).  This is a kluge, but it means we will capture
-            * entire C functions that differ only by brace placement.
-            */
-           if (remove_braces && braceline)
-               extend_current_chunk(file->length);
            continue;
-       }
 
        /* maybe we can get the file type from the first line? */
        if (linecount == 1 && buf[0] == '#')

diff --git a/main.c b/main.c
index 8c8b3642229f9bc3f6ac1ced06a4d72f1f85dcc3..913f760afa44a9c29dd24e3af09bef386a39d4f8 100644 (file)
--- a/main.c
+++ b/main.c
@@ -88,13 +88,13 @@ void corehook(struct hash_t hash, struct filehdr_t *file)
     sort_count++;
 }
 
-void extend_current_chunk(limit)
-/* bump the end-line number on the last chunk, if there is one */
+void extend_current_chunk(linenum_t linenumber)
+/* set the end-line number on the last chunk, if there is one */
 {
     if (sort_count > 0)
-       sort_buffer[sort_count-1].hash.end++;
+       sort_buffer[sort_count-1].hash.end = linenumber;
     if (chunk_count > 0)
-       chunk_buffer[chunk_count-1].end++;
+       chunk_buffer[chunk_count-1].end = linenumber;
 }
 
 static void write_options(char *buf)

diff --git a/shred.h b/shred.h
index 7c27233ac4534d385397ae9a5363564a9a6b8d42..8fb366a3e583953456ed905c152279c3ccbad9e5 100644 (file)
--- a/shred.h
+++ b/shred.h
@@ -70,7 +70,7 @@ extern int shredsize, minsize;
 extern void report_time(char *legend, ...);
 struct filehdr_t *register_file(const char *file, linenum_t length);
 extern void corehook(struct hash_t hash, struct filehdr_t *file);
-extern void extend_current_chunk(int);
+extern void extend_current_chunk(linenum_t);
 extern void dump_array(const char *legend,
                       struct sorthash_t *obarray, int hashcount);
 extern void dump_flags(const int flags, FILE *fp);

diff --git a/shredtree.c b/shredtree.c
index 86434da71fd191e8ab728e37e93cdeb6c1fcd9a1..16821d0f37c005ed0f16d958d3cb55fe4ad6329a 100644 (file)
--- a/shredtree.c
+++ b/shredtree.c
@@ -162,6 +162,15 @@ int shredfile(struct filehdr_t *file,
     }
     if (accepted && accepted < shredsize)
        hook(emit_chunk(display, linenumber), file);
+    else if (accepted)
+       /*
+        * What this is for is to include trailing C } lines in chunk
+        * listings even though we're ignoring them for comparison 
+        * purposes (in order not to be fooled by variance in indent
+        * styles).  This is a kluge, but it means we will capture
+        * entire C functions that differ only by brace placement.
+        */
+       extend_current_chunk(linenumber);
 
     free(display);
     fclose(fp);