diff options
| author | Roland McGrath <roland@redhat.com> | 2008-01-22 01:56:41 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@redhat.com> | 2008-01-22 01:56:41 +0000 |
| commit | c58110d291bbd39e416d322076dc58bddf56bcf0 (patch) | |
| tree | 3de66c784a7767ece3fa01b2ad0f6403e88ec0cb /src | |
| parent | c0d3c265f06daa943df2c990daab1ce059749d4b (diff) | |
| download | elfutils-c58110d291bbd39e416d322076dc58bddf56bcf0.tar.gz | |
explicit merge of 'f9dc98cac1b8ccd38e7420c43dfe7551e2923aaa'elfutils-0.132
and '90e87946af64cdaa0fc75d344ca35ee2729e655d'
Diffstat (limited to 'src')
| -rw-r--r-- | src/readelf.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/readelf.c b/src/readelf.c index 2eba7e9d..90c460f9 100644 --- a/src/readelf.c +++ b/src/readelf.c @@ -4041,8 +4041,7 @@ attr_callback (Dwarf_Attribute *attrp, void *arg) if (unlikely (dwarf_formaddr (attrp, &addr) != 0)) { attrval_out: - error (0, 0, gettext ("offset: %" PRIx64 " cannot get attribute value: %s"), - attrp->valp - (unsigned char *) attrp->cu->dbg->sectiondata[IDX_debug_info]->d_buf, + error (0, 0, gettext ("cannot get attribute value: %s"), dwarf_errmsg (-1)); return DWARF_CB_ABORT; } @@ -4286,7 +4285,7 @@ print_debug_info_section (Dwfl_Module *dwflmod, int tag = dwarf_tag (&dies[level]); if (unlikely (tag == DW_TAG_invalid)) { - error (0, 0, gettext ("cannot get tag of DIE at offset %" PRIx64 + error (0, 0, gettext ("cannot get tag of DIE at offset %" PRIu64 " in section '%s': %s"), (uint64_t) offset, ".debug_info", dwarf_errmsg (-1)); goto do_return; @@ -4310,10 +4309,8 @@ print_debug_info_section (Dwfl_Module *dwflmod, if (res > 0) { while ((res = dwarf_siblingof (&dies[level], &dies[level])) == 1) - { - if (level-- == 0) - break; - } + if (level-- == 0) + break; if (unlikely (res == -1)) { |