Date: Sat, 19 May 2018 12:23:19 -0700 From: Conrad Meyer <cem@freebsd.org> To: Matt Macy <mmacy@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r333885 - head/cddl/contrib/opensolaris/tools/ctf/cvt Message-ID: <CAG6CVpUEd_QDEk05hBSc_svQ98eyUbZOPBHSBVRLp7aHRnzGrg@mail.gmail.com> In-Reply-To: <201805191850.w4JIoxrv073533@repo.freebsd.org> References: <201805191850.w4JIoxrv073533@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is super nitpicky, and apologies, but: On Sat, May 19, 2018 at 11:50 AM, Matt Macy <mmacy@freebsd.org> wrote: > Author: mmacy > Date: Sat May 19 18:50:58 2018 > New Revision: 333885 > URL: https://svnweb.freebsd.org/changeset/base/333885 > > Log: > ctf dwarf: don't report "no dwarf entry" as if it were an error > > Modified: > head/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c > > Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c > ============================================================================== > --- head/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Sat May 19 18:44:29 2018 (r333884) > +++ head/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Sat May 19 18:50:58 2018 (r333885) > @@ -1941,9 +1941,12 @@ dw_read(tdata_t *td, Elf *elf, char *filename __unused > } > > if ((rc = dwarf_next_cu_header_b(dw.dw_dw, &hdrlen, &vers, &abboff, > - &addrsz, &offsz, NULL, &nxthdr, &dw.dw_err)) != DW_DLV_OK) > - terminate("rc = %d %s\n", rc, dwarf_errmsg(dw.dw_err)); > - > + &addrsz, &offsz, NULL, &nxthdr, &dw.dw_err)) != DW_DLV_OK) { The above line's indentation was correct before, and now isn't. > + if (dw.dw_err.err_error == DW_DLE_NO_ENTRY) There is some funky whitespace going on here. Thanks, Conrad > + exit(0); > + else > + terminate("rc = %d %s\n", rc, dwarf_errmsg(dw.dw_err)); > + } > if ((cu = die_sibling(&dw, NULL)) == NULL || > (((child = die_child(&dw, cu)) == NULL) && > should_have_dwarf(elf))) { >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAG6CVpUEd_QDEk05hBSc_svQ98eyUbZOPBHSBVRLp7aHRnzGrg>