diff options
| author | David Smith <dsmith@redhat.com> | 2008-06-17 09:20:16 -0500 |
|---|---|---|
| committer | David Smith <dsmith@redhat.com> | 2008-06-17 09:20:16 -0500 |
| commit | 6ebf08661086e6739b9fd58ddae336a91113306e (patch) | |
| tree | 9f45b8f3808ed1a5ab1bb144f525b3a464dfb12c /tapsets.cxx | |
| parent | 81c361887ec0a5cfd9bdb635b999b590cb7b57f7 (diff) | |
| parent | c815c982cc0691360dfd3073276dba071aac840e (diff) | |
| download | systemtap-steved-6ebf08661086e6739b9fd58ddae336a91113306e.tar.gz systemtap-steved-6ebf08661086e6739b9fd58ddae336a91113306e.tar.xz systemtap-steved-6ebf08661086e6739b9fd58ddae336a91113306e.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap into work
Diffstat (limited to 'tapsets.cxx')
| -rw-r--r-- | tapsets.cxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tapsets.cxx b/tapsets.cxx index 41b0b34d..7bfe8b4e 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -1585,7 +1585,6 @@ struct dwflpp void print_locals(Dwarf_Die *die, ostream &o) { // Try to get the first child of die. - bool local_found = false; Dwarf_Die child; if (dwarf_child (die, &child) == 0) { @@ -1598,7 +1597,6 @@ struct dwflpp case DW_TAG_variable: case DW_TAG_formal_parameter: o << " " << dwarf_diename (&child); - local_found = true; break; default: break; @@ -1606,9 +1604,6 @@ struct dwflpp } while (dwarf_siblingof (&child, &child) == 0); } - - if (! local_found) - o << " (none found)"; } Dwarf_Attribute * @@ -1646,8 +1641,7 @@ struct dwflpp print_locals (scopes, alternatives); throw semantic_error ("unable to find local '" + local + "'" + " near pc " + lex_cast_hex<string>(pc) - + " (alternatives:" + alternatives.str () - + ")"); + + (alternatives.str() == "" ? "" : (" (alternatives:" + alternatives.str () + ")"))); } for (int inner = 0; inner < nscopes; ++inner) |