diff options
Diffstat (limited to 'src/usr')
| -rwxr-xr-x | src/usr/diag/prdf/common/framework/service/prdfTargetServices.C | 4 | ||||
| -rw-r--r-- | src/usr/diag/prdf/plat/pegasus/prdfPlatCenMembuf.C | 2 | ||||
| -rw-r--r-- | src/usr/trace/interface.C | 6 | ||||
| -rwxr-xr-x | src/usr/vpd/test/cvpdtest.H | 8 |
4 files changed, 12 insertions, 8 deletions
diff --git a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C index 0365d8807..f0341d830 100755 --- a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C +++ b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C @@ -832,7 +832,9 @@ uint32_t getTargetPosition( TARGETING::TargetHandle_t i_target ) { uint16_t tmpPos = 0; if ( !i_target->tryGetAttr<ATTR_POSITION>(tmpPos) ) + { PRDF_ERR( PRDF_FUNC"Failed to get ATTR_POSITION" ); + } else o_pos = (uint32_t)tmpPos; break; @@ -852,7 +854,9 @@ uint32_t getTargetPosition( TARGETING::TargetHandle_t i_target ) { uint8_t tmpPos = 0; if ( !i_target->tryGetAttr<ATTR_CHIP_UNIT>(tmpPos) ) + { PRDF_ERR( PRDF_FUNC"Failed to get ATTR_CHIP_UNIT" ); + } else o_pos = (uint32_t)tmpPos; break; diff --git a/src/usr/diag/prdf/plat/pegasus/prdfPlatCenMembuf.C b/src/usr/diag/prdf/plat/pegasus/prdfPlatCenMembuf.C index 108c7f28d..3109c3f10 100644 --- a/src/usr/diag/prdf/plat/pegasus/prdfPlatCenMembuf.C +++ b/src/usr/diag/prdf/plat/pegasus/prdfPlatCenMembuf.C @@ -49,7 +49,7 @@ namespace Membuf #define PLUGIN_UNEXPECTED_ATTN( FUNC ) \ int32_t FUNC( ExtensibleChip * i_membChip, STEP_CODE_DATA_STRUCT & i_sc ) \ { \ - PRDF_ERR( "["FUNC"] Unexpected attention in Hostboot: HUID=0x%08x", \ + PRDF_ERR( "["#FUNC"] Unexpected attention in Hostboot: HUID=0x%08x", \ i_membChip->GetId() ); \ CalloutUtil::defaultError( i_sc ); \ return SUCCESS; \ diff --git a/src/usr/trace/interface.C b/src/usr/trace/interface.C index ba9eb765c..5ca18db37 100644 --- a/src/usr/trace/interface.C +++ b/src/usr/trace/interface.C @@ -69,15 +69,15 @@ namespace TRACE } void trace_adal_write_all(ComponentDesc * io_td, - const trace_hash_val i_hash, - const char * i_fmt, + const traceCodeInfo* i_info, const uint32_t i_line, const uint32_t i_type, ...) { va_list args; va_start(args, i_type); - Singleton<Service>::instance().writeEntry(io_td, i_hash, i_fmt, + Singleton<Service>::instance().writeEntry(io_td, + i_info->hash, i_info->format, i_line, i_type, args); va_end(args); diff --git a/src/usr/vpd/test/cvpdtest.H b/src/usr/vpd/test/cvpdtest.H index 0f8865169..957a328ef 100755 --- a/src/usr/vpd/test/cvpdtest.H +++ b/src/usr/vpd/test/cvpdtest.H @@ -267,7 +267,7 @@ class CVPDTest: public CxxTest::TestSuite // first figure out how big the keyword is cmds++; - size_t theSize = 0; + size_t theSize = 0; err = deviceRead( theTarget, testData, theSize, @@ -328,7 +328,7 @@ class CVPDTest: public CxxTest::TestSuite errlCommit( err, VPD_COMP_ID ); continue; - } + } // verify the data got written cmds++; @@ -379,7 +379,7 @@ class CVPDTest: public CxxTest::TestSuite VPD_COMP_ID ); continue; } - + } while( 0 ); if( NULL != testData ) @@ -402,7 +402,7 @@ class CVPDTest: public CxxTest::TestSuite if( cmds == 0 ) { - TS_FAIL(x"testCvpdWrite - No tests ran, something is wrong..."); + TS_FAIL("testCvpdWrite - No tests ran, something is wrong..."); } TRACFCOMP( g_trac_vpd, |
