diff options
| author | John Sonnenschein <johns@joyent.com> | 2011-12-15 22:43:18 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2011-12-15 22:43:18 +0000 |
| commit | c4aa323138d7633d35c7cbf4123aa100970a91f9 (patch) | |
| tree | 596fe3d0c3374835bf0e2e1d31e3ea8f3659422a /usr/src/tools/ctf/cvt/dwarf.c | |
| parent | 73c531dd5303a633bcaaf609c6eeb2554096b478 (diff) | |
| parent | f9b22ee9e48b04a9ef01426e92a13c5b164c0763 (diff) | |
| download | illumos-joyent-c4aa323138d7633d35c7cbf4123aa100970a91f9.tar.gz | |
Merge branch 'master' into gcc4
Diffstat (limited to 'usr/src/tools/ctf/cvt/dwarf.c')
| -rw-r--r-- | usr/src/tools/ctf/cvt/dwarf.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr/src/tools/ctf/cvt/dwarf.c b/usr/src/tools/ctf/cvt/dwarf.c index a7e97dfb23..ce8f6f9601 100644 --- a/usr/src/tools/ctf/cvt/dwarf.c +++ b/usr/src/tools/ctf/cvt/dwarf.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * DWARF to tdata conversion * @@ -1832,8 +1830,11 @@ dw_read(tdata_t *td, Elf *elf, const char *filename) } if ((rc = dwarf_next_cu_header(dw.dw_dw, &hdrlen, &vers, &abboff, - &addrsz, &nxthdr, &dw.dw_err)) != DW_DLV_OK || - (cu = die_sibling(&dw, NULL)) == NULL || + &addrsz, &nxthdr, &dw.dw_err)) != DW_DLV_OK) + terminate("file does not contain valid DWARF data: %s\n", + dwarf_errmsg(dw.dw_err)); + + if ((cu = die_sibling(&dw, NULL)) == NULL || (child = die_child(&dw, cu)) == NULL) terminate("file does not contain dwarf type data " "(try compiling with -g)\n"); |