From owner-svn-src-head@freebsd.org Mon Jun 1 11:03:10 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EB04F331E5A; Mon, 1 Jun 2020 11:03:10 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49bC2Q3RSdz4f5d; Mon, 1 Jun 2020 11:03:09 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id 051B32t9012109; Mon, 1 Jun 2020 04:03:02 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 051B32gH012108; Mon, 1 Jun 2020 04:03:02 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202006011103.051B32gH012108@gndrsh.dnsmgr.net> Subject: Re: svn commit: r361685 - head/sys/kern In-Reply-To: <202006010337.0513bx0N025996@repo.freebsd.org> To: Peter Wemm Date: Mon, 1 Jun 2020 04:03:02 -0700 (PDT) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 49bC2Q3RSdz4f5d X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 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: Mon, 01 Jun 2020 11:03:11 -0000 [ Charset UTF-8 unsupported, converting... ] > Author: peter > Date: Mon Jun 1 03:37:58 2020 > New Revision: 361685 > URL: https://svnweb.freebsd.org/changeset/base/361685 > > Log: > Clarify which hints file is the source of an error message. Better correction could be to use the variable storing the name that is used. > > PR: 246688 > Submitted by: Ashish Gupta > MFC after: 1 week > > Modified: > head/sys/kern/kern_linker.c > > Modified: head/sys/kern/kern_linker.c > ============================================================================== > --- head/sys/kern/kern_linker.c Mon Jun 1 02:54:10 2020 (r361684) > +++ head/sys/kern/kern_linker.c Mon Jun 1 03:37:58 2020 (r361685) > @@ -1870,7 +1870,7 @@ linker_hints_lookup(const char *path, int pathlen, con > * XXX: we need to limit this number to some reasonable value > */ > if (vattr.va_size > LINKER_HINTS_MAX) { > - printf("hints file too large %ld\n", (long)vattr.va_size); > + printf("linker.hints file too large %ld\n", (long)vattr.va_size); + printf("%s file too large %ld\n", linker_hintfile, (long)vattr.va_size); > goto bad; > } > hints = malloc(vattr.va_size, M_TEMP, M_WAITOK); > @@ -1888,7 +1888,7 @@ linker_hints_lookup(const char *path, int pathlen, con > intp = (int *)hints; > ival = *intp++; > if (ival != LINKER_HINTS_VERSION) { > - printf("hints file version mismatch %d\n", ival); > + printf("linker.hints file version mismatch %d\n", ival); Ditto. > goto bad; > } > bufend = hints + vattr.va_size; > -- Rod Grimes rgrimes@freebsd.org