From dddd1ef3658b3a3a846ec64c3e6ba9ba1f7b746e Mon Sep 17 00:00:00 2001
From: "Terry J. Opie" <opiet@us.ibm.com>
Date: Thu, 27 Oct 2011 12:48:46 -0500
Subject: I2C Bad Machine Path and Cxx Testcases as well as the EEPROM device
 driver.

Change-Id: Ia89d3aecb3192a2f99ef9fbb5abe0ce1d528a481
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/506
Tested-by: Jenkins Server
Reviewed-by: Terry J. Opie <opiet@us.ibm.com>
---
 src/usr/errl/parser/scanforsrcs.pl | 29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

(limited to 'src/usr/errl/parser')

diff --git a/src/usr/errl/parser/scanforsrcs.pl b/src/usr/errl/parser/scanforsrcs.pl
index c54df9fb1..d6d594a18 100755
--- a/src/usr/errl/parser/scanforsrcs.pl
+++ b/src/usr/errl/parser/scanforsrcs.pl
@@ -373,7 +373,6 @@ sub getFiles
     opendir(DH, $l_input_dir) or die("Cannot open $l_input_dir: $!");
     # skip the dots
     @dir_entry = grep { !/^\./ } readdir(DH);
-    #@dir_entry = readdir(DH);
     closedir(DH);
     while (@dir_entry)
     {
@@ -382,12 +381,6 @@ sub getFiles
 
         debugMsg( "getFiles: Full Path: $full_path" );
 
-#        if ($full_path =~ /\/$comp\/test/g)  # skip the test dirs
-#        {
-#            debugMsg( "Found test dir - next!!" );
-#            next;
-#        }
-#        elsif ($l_entry =~ /\.[H|C]$/)
         if ($l_entry =~ /\.[H|C]$/)
         {
             $l_input_files{$l_entry} = $full_path;
@@ -466,18 +459,6 @@ sub includeReasonCodes
     {
         debugMsg( "includeReasonCodes file: $file" );
         my @allDirs = split( '/', $file );
-#        $tmpParent = pop @allDirs;
-
-#        if( $parentDir ne "" )
-#        {
-#            $parentDir = $parentDir."/$tmpParent";
-#        }
-#        else
-#        {
-#            $parentDir = $tmpParent;
-#        }
-#        debugMsg( "includeReasonCodes parent dir: $parentDir" );
-#        debugMsg( "includeReasonCodes tmpparent: $tmpParent" );
 
         if( $file =~ m/reasoncodes/i )
         {
@@ -498,10 +479,13 @@ sub includeReasonCodes
             debugMsg( "Include string: $incFileName" );
 
             print $fh "#include <$incFileName>\n";
-#            print $fh "#include <$parentDir>\n";
 
             # Find the namespace of the reason codes
-            findNameSpace( $file )
+            findNameSpace( $file );
+
+            # Clear out incFileName, in case there are 2 reason code files
+            # in the same directory
+            $incFileName = "";
         }
         elsif( -d $file )
         {
@@ -509,9 +493,6 @@ sub includeReasonCodes
             # Recursion is done here.
             includeReasonCodes( $fh, $file."/*", ($level+1) );
         }
-
-#        $parentDir = "";
-#        $tmpParent = "";
     }
 }
 
-- 
cgit v1.2.1