From owner-svn-src-head@freebsd.org Sat May 19 19:52:41 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1C143EE1C30; Sat, 19 May 2018 19:52:41 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-io0-f182.google.com (mail-io0-f182.google.com [209.85.223.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B0BEC7D47A; Sat, 19 May 2018 19:52:40 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-io0-f182.google.com with SMTP id g1-v6so10112987iob.2; Sat, 19 May 2018 12:52:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :from:date:message-id:subject:to:cc; bh=3L3ljYnXFjEgUrbjymcenWEs4HTui7CFseeF4xjKb5w=; b=cjAiaCnVciY1XRfmrykJMnqqxGy+goLyMf9DsjOVwA5yqZfAzCo0723FeWoRrXQczL 49PWPdF1R8EncIUx5Hpkq7+ngv0fdufBYdUN6WqGqcOdCW4fKK/WFVjeq2qiDDDqZodV NBkSsWgMciIRmQ4ANmVdD0kRitEu4Ui2r9TuhT49gEEwzUnkHKNeTmZwMpwjh6osZmsT CfTDOv88wBUdNaecud/RHpZfvzKiRdbO4owWv5kw6zotQArdHJjBv9fcYYkJvCro4ixv HOGal+V9QdNLAHppSwcHd+dERZGImQU8mc/WKMLxwBG4Ak5Pl3XsObA6NVqPw1+hqCpX 8PQg== X-Gm-Message-State: ALKqPwdJW/w/g57jMSLNGH29St6ve4bod38Tnti7GBQnhXF+XWfj7soG /lbuQvDHTkJ3tH5qD8gNkQwfgUzm X-Google-Smtp-Source: AB8JxZrQTIWBf7JG88mvcG4FW4T3WudZAAtEmH3Z7FpdJNYFs+eoB+EMu8gzSezuGxy2UqFxw8Umow== X-Received: by 2002:a6b:cd49:: with SMTP id d70-v6mr15580557iog.150.1526757800491; Sat, 19 May 2018 12:23:20 -0700 (PDT) Received: from mail-io0-f178.google.com (mail-io0-f178.google.com. [209.85.223.178]) by smtp.gmail.com with ESMTPSA id t9-v6sm5939516ioa.82.2018.05.19.12.23.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 May 2018 12:23:19 -0700 (PDT) Received: by mail-io0-f178.google.com with SMTP id e20-v6so10055431iof.4; Sat, 19 May 2018 12:23:19 -0700 (PDT) X-Received: by 2002:a6b:545:: with SMTP id 66-v6mr15474684iof.173.1526757799746; Sat, 19 May 2018 12:23:19 -0700 (PDT) MIME-Version: 1.0 Reply-To: cem@freebsd.org Received: by 2002:a02:d81:0:0:0:0:0 with HTTP; Sat, 19 May 2018 12:23:19 -0700 (PDT) In-Reply-To: <201805191850.w4JIoxrv073533@repo.freebsd.org> References: <201805191850.w4JIoxrv073533@repo.freebsd.org> From: Conrad Meyer Date: Sat, 19 May 2018 12:23:19 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r333885 - head/cddl/contrib/opensolaris/tools/ctf/cvt To: Matt Macy Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 May 2018 19:52:41 -0000 This is super nitpicky, and apologies, but: On Sat, May 19, 2018 at 11:50 AM, Matt Macy 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))) { >