ChangeLogTag: Wed Jan 5 13:21:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 20 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 23337e13083..b43aa0207a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Wed Jan  5 13:21:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/fuzz.pl:
+          Added zip files to the noncvs files that shouldn't be in the repo.
+          Added a new check that tests for inline files just containing empty
+          lines and c-style comments. These files shouldn't be in the repo
+          and need to get removed. There is an exclusion for TAO_IDL generated
+          files, we don't have an option yet to suppress the generation of
+          empty inline files so, we allow them for the time being. Thanks to
+          Don Hinton, Carlos O'Ryan and Martin Corino for their answers
+          on my questions.
+
 Wed Jan  5 09:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/OS_NS_dirent.inl (readdir_r):
diff --git a/bin/fuzz.pl b/bin/fuzz.pl
index d61b3ca499c..5ed6cb93d5e 100755
--- a/bin/fuzz.pl
+++ b/bin/fuzz.pl
@@ -496,20 +496,21 @@ sub check_for_empty_inline_files ()
 {
     print "Running empty inline files test\n";
     foreach $file (@files_inl) {
-        my $found = 0;
-        my $ignore = 0;
+        my $found_non_empty_line = 0;
+        my $idl_generated = 0;
         if (open (FILE, $file)) {
             print "Looking at file $file\n" if $opt_d;
             while (<FILE>) {
-              if (/\/\/ TAO and the TAO IDL Compiler have been developed by/) {# skip IDL generated files
-                $ignore = 1;
-                next;}
+              if (m/TAO and the TAO IDL Compiler have been developed by/) {# skip IDL generated files
+                $idl_generated = 1;
+                last;}
               next if /^[:blank:]*$/; # skip empty lines
               next if /^[:blank:]*\/\//; # skip C++ comments
-              $found = 1;
+              $found_non_empty_line = 1;
+              last;
             }
             close (FILE);
-            if ($found == 0 and $ignore == 0) {
+            if ($found_non_empty_line == 0 and $idl_generated == 0) {
              print_error ("File $file is empty and should not be in the "
                          ."repository");
             }