diff options
| author | Brian Silver <bsilver@us.ibm.com> | 2015-05-27 10:44:06 -0500 |
|---|---|---|
| committer | Patrick Williams <iawillia@us.ibm.com> | 2015-12-11 13:40:20 -0600 |
| commit | 2975cbeac91ff0c190582a4e9fc3246a513afd21 (patch) | |
| tree | 1cfcb7b939fe7dd609368e61aaab56faf78c3c4a /src/import/hwpf/fapi2 | |
| parent | c41b768bf19e997f4a5b85893d51fa48d12499bf (diff) | |
| download | blackbird-hostboot-2975cbeac91ff0c190582a4e9fc3246a513afd21.tar.gz blackbird-hostboot-2975cbeac91ff0c190582a4e9fc3246a513afd21.zip | |
Ensure FFDC return code is set even if using empty classes
Change-Id: I04d80f91b9ccdf5ce0aaf920770458e7d015b971
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/17984
Tested-by: Jenkins Server
Reviewed-by: Matt K. Light <mklight@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: Brian Silver <bsilver@us.ibm.com>
Diffstat (limited to 'src/import/hwpf/fapi2')
| -rwxr-xr-x | src/import/hwpf/fapi2/tools/parseErrorInfo.pl | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/import/hwpf/fapi2/tools/parseErrorInfo.pl b/src/import/hwpf/fapi2/tools/parseErrorInfo.pl index bbef07752..61b6c96db 100755 --- a/src/import/hwpf/fapi2/tools/parseErrorInfo.pl +++ b/src/import/hwpf/fapi2/tools/parseErrorInfo.pl @@ -1173,8 +1173,12 @@ foreach my $argnum (0 .. $#ARGV) else { # Void expression keeps the compiler from complaining about the unused arguments. + # We want to set the i_rc to the RC if we're empty. This otherwise gets done in _setHwpError() print ECFILE " $class_name(fapi2::errlSeverity_t i_sev = fapi2::FAPI2_ERRL_SEV_UNRECOVERABLE, fapi2::ReturnCode& i_rc = fapi2::current_err)\n"; - print ECFILE " {static_cast<void>(i_sev); static_cast<void>(i_rc);}\n\n"; + print ECFILE " {\n"; + print ECFILE " static_cast<void>(i_sev);\n"; + print ECFILE " i_rc = $err->{rc};\n"; + print ECFILE " }\n\n"; } # Methods @@ -1190,13 +1194,15 @@ foreach my $argnum (0 .. $#ARGV) if ($arg_empty_ffdc eq undef) { print ECFILE " {\n"; - print ECFILE " FAPI_SET_HWP_ERROR(iv_rc, $err->{rc});\n" if ($arg_empty_ffdc eq undef); - print ECFILE " fapi2::logError(iv_rc, (i_sev == fapi2::FAPI2_ERRL_SEV_UNDEFINED) ? iv_sev : i_sev);\n" if ($arg_empty_ffdc eq undef); + print ECFILE " FAPI_SET_HWP_ERROR(iv_rc, $err->{rc});\n"; + print ECFILE " fapi2::logError(iv_rc, (i_sev == fapi2::FAPI2_ERRL_SEV_UNDEFINED) ? iv_sev : i_sev);\n"; print ECFILE " }\n\n"; } else { - print ECFILE " {static_cast<void>(i_sev);}\n\n"; + print ECFILE " {\n"; + print ECFILE " static_cast<void>(i_sev);\n"; + print ECFILE " }\n\n"; } # Instance variables |
