summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Jones <mjjones@us.ibm.com>2011-10-28 13:28:47 -0500
committerMIKE J. JONES <mjjones@us.ibm.com>2011-10-28 14:34:09 -0500
commitf2794eed87ca9c35140c601dfcbb5baf299d834b (patch)
tree1f5e4a4d0018984b524716c81564857094f6a92b
parent7e2d025969d46a4f6fe1dab6e4c40061ce8e6fec (diff)
downloadtalos-hostboot-f2794eed87ca9c35140c601dfcbb5baf299d834b.tar.gz
talos-hostboot-f2794eed87ca9c35140c601dfcbb5baf299d834b.zip
Fix error log tag and fix bug in tag perser
Change-Id: Ic72e58d69769bbe3bf39dc3d8db16fdb2409711a Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/466 Tested-by: Jenkins Server Reviewed-by: Mark W. Wenning <wenning@us.ibm.com> Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
-rwxr-xr-xsrc/usr/errl/parser/scanforsrcs.pl14
-rw-r--r--src/usr/hwpf/plat/fapiPlatAttributeService.C6
2 files changed, 6 insertions, 14 deletions
diff --git a/src/usr/errl/parser/scanforsrcs.pl b/src/usr/errl/parser/scanforsrcs.pl
index 3368b329d..83fbfed5a 100755
--- a/src/usr/errl/parser/scanforsrcs.pl
+++ b/src/usr/errl/parser/scanforsrcs.pl
@@ -299,7 +299,6 @@ sub extractTags
my $data;
my ($file, $comp) = @_;
debugMsg( "extractTags: Component: $comp" );
- my $found = 0;
local *FH;
debugMsg( "Processing: $file" );
@@ -326,12 +325,6 @@ sub extractTags
{
debugMsg( "Found New Error Tag!" );
- if( !$found )
- {
- findNameSpace( $file )
- }
-
- $found = 1;
my $text = $1;
debugMsg( "Text1: $text" );
my %hash = $text =~ /\@(\S+)(?:\s+|\.+)\b(.+?)$/gm;
@@ -506,6 +499,9 @@ sub includeReasonCodes
print $fh "#include <$incFileName>\n";
# print $fh "#include <$parentDir>\n";
+
+ # Find the namespace of the reason codes
+ findNameSpace( $file )
}
elsif( -d $file )
{
@@ -566,10 +562,6 @@ EOF
print $fh "using namespace $namespace;\n"
}
- # VFS namespace is defined in header file with no errors, so we didn't
- # find it...
- print $fh "using namespace VFS;\n";
-
print $fh <<EOF;
diff --git a/src/usr/hwpf/plat/fapiPlatAttributeService.C b/src/usr/hwpf/plat/fapiPlatAttributeService.C
index e72e637f5..06a5392bf 100644
--- a/src/usr/hwpf/plat/fapiPlatAttributeService.C
+++ b/src/usr/hwpf/plat/fapiPlatAttributeService.C
@@ -70,10 +70,10 @@ fapi::ReturnCode createAttrAccessError(
const fapi::AttributeId i_fapiAttrId,
const fapi::Target* const i_pFapiTarget)
{
- /*
+ /*@
* @errortype
- * @moduleid fapi::MOD_PLAT_ATTR_SVC_CREATE_ATTR_ACCESS_ERROR
- * @reasoncode fapi::RC_FAILED_TO_ACCESS_ATTRIBUTE
+ * @moduleid MOD_PLAT_ATTR_SVC_CREATE_ATTR_ACCESS_ERROR
+ * @reasoncode RC_FAILED_TO_ACCESS_ATTRIBUTE
* @userdata1 Top 32 bits = platform attribute ID, lower 32 bits =
* FAPI attribute ID
* @userdata2 FAPI target type, or NULL if system target
OpenPOWER on IntegriCloud