From nobody Tue Mar 01 13:27:50 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A200419EC4BE; Tue, 1 Mar 2022 13:27:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K7J2t3HNRz4nwJ; Tue, 1 Mar 2022 13:27:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646141270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PEIdPDfuwlpz8h7PK2oQsSVfuOC8CT1FBCbsDdQKCXM=; b=PKXVJStKbwGExqeqURkM+T8QeFG5Ia7hluYsMChgk9h+X5NxvJPOgT/2fY02Z7cX391TGD PFGGaMsRrxCzUPoXKEY74AwR84gilA2H+5FKTj6B7KLLwChs5wzshJtuzdCrIOlzrDVsRF dMvMMj28n62VjFCzncwng+sRUCr3rRxeuC5j78pJ9n17o4Q46xEYQH9RVIN+qNNkMOAdEK pXRMXh3fdPmMCh+d/Am7jAbATGId/YRSj75t6khtBdfgii75ztr22f0vkAiPmaWehBJvZB s1/FreAq2vyG0DSE/kN/PJrYQD/ydenxfFez0NEiaTLSXusgDvYvxtu7VnfDcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4EB66106A5; Tue, 1 Mar 2022 13:27:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 221DRoCp044406; Tue, 1 Mar 2022 13:27:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 221DRoPF044405; Tue, 1 Mar 2022 13:27:50 GMT (envelope-from git) Date: Tue, 1 Mar 2022 13:27:50 GMT Message-Id: <202203011327.221DRoPF044405@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 4be7d087c2b5 - main - diff: Use start of change when searching for function List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4be7d087c2b566f4910683836be279d55c1a81c6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646141270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PEIdPDfuwlpz8h7PK2oQsSVfuOC8CT1FBCbsDdQKCXM=; b=fhlQrs+G+KV7DyJK3RQqq3ZdzfaX94vfkQwUEaqVbJMKvFDePTkhp1Zbdapfo6HYZtq4XJ 1ipiyVwweeoaskZXI25PVrwaMUUTzxayNJH+3padHIJQUf6Myq/UpaBl5PiwY0ArOgP1Md 9LClYHGLQ7+sBjfJFAQouchRQXK6pQLn5Qks72Dp5nZBQU2ePO+ZHnaLVLTH1U8EMXXabo vetsUclu4zRVicpR9JKw8WZ5bddbt6zEct+B5cORpakc2RXnWLrjP6YDapmqY1bvoHMF5i 2c00SX7G5UkkF8nw/L0GLifU1zAH9oV9Z1L+YAduZujtMaMpGWqvB13KEjFrxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646141270; a=rsa-sha256; cv=none; b=IzduWztL9gSzh3oS2WJXb0UXDXVMS2qotPpPBCKZ/kUcPgpd70g/jVjam+2WN5sDleOUWU B927YJ5txopzycm5iYPo+Os8v9FNs0PtKajBLT/9NggjXrIjTOY/wVl3tNLyaqU9WxKXvA pLzI/rauJHkPvql+qFxhcUm8RGpolcLajnyh7e967b1AmqS1+YpVzl8YsddjGvpCtxX/5Y t5I4S/OOec1U4nwXoXAW1tP+6YPLcwYQjItcYtkjQbxpOojWov86p8p4ZFmcHZC0bCS8Sv lhxvK69euk1Kxd+ZqJCObIlDhEFHR5Au3WPix+oadGUptezSA9WoRK+t1sEgHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=4be7d087c2b566f4910683836be279d55c1a81c6 commit 4be7d087c2b566f4910683836be279d55c1a81c6 Author: Tom Jones AuthorDate: 2022-03-01 13:23:25 +0000 Commit: Tom Jones CommitDate: 2022-03-01 13:27:21 +0000 diff: Use start of change when searching for function Use the start of change when searching for a function rather than the start of the context. In short functions if this could result in search for the function name starting from before the function definition. PR: 262086 Reviewed by: bapt, mckusick, mhorne Sponsored by: Klara Inc. Differential Revision: https://reviews.freebsd.org/D34328 --- usr.bin/diff/diffreg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c index ae815aa4e01f..4fbdd3c3f50c 100644 --- a/usr.bin/diff/diffreg.c +++ b/usr.bin/diff/diffreg.c @@ -1462,7 +1462,7 @@ dump_context_vec(FILE *f1, FILE *f2, int flags) printf("***************"); if (flags & (D_PROTOTYPE | D_MATCHLAST)) { - f = match_function(ixold, lowa - 1, f1); + f = match_function(ixold, cvp->a - 1, f1); if (f != NULL) printf(" %s", f); } @@ -1569,7 +1569,7 @@ dump_unified_vec(FILE *f1, FILE *f2, int flags) uni_range(lowc, upd); printf(" @@"); if (flags & (D_PROTOTYPE | D_MATCHLAST)) { - f = match_function(ixold, lowa - 1, f1); + f = match_function(ixold, cvp->a - 1, f1); if (f != NULL) printf(" %s", f); }