From nobody Thu Feb 03 17:03:23 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 E8A4F19A6B9F; Thu, 3 Feb 2022 17:03:23 +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 4JqQ3b6Gxsz3DQt; Thu, 3 Feb 2022 17:03:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643907803; 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=jS2hGItYGJr/faI4w7YKkxtL529V9j9OhranfkXlrkw=; b=J+39iXYqX8ldFVebVD4OqRbIFX6/2b+EF5gZLMWgDQS80q8CFen/igZtNpVEWsoRjC4Wv7 uidOlEiOiyLqMEoSEX8MUDH51OBkcRVk/nWUnlHsobD7fiw+3gGHSoAX9TNJ5/PAXPbDl7 oljsR0UALbGgM7+L3Yz3QFjW50VGFA2oIbopd94skqkq85YWGuv5D6BN0vJNL7cMbo67fU zABbPOWbmPx2ABh+QTJdqEv0ATAR+2O+usEPMXh5DVf9r36xqbcF+V174EHquNyX11DY5L kdE6HPZ13P2JeXMcDKhuYZNaBUcQ2olRomV6Neojye/+xQshzs20IXsDna6/RQ== 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 B75CA1BBB6; Thu, 3 Feb 2022 17:03:23 +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 213H3N6K039907; Thu, 3 Feb 2022 17:03:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 213H3NtC039906; Thu, 3 Feb 2022 17:03:23 GMT (envelope-from git) Date: Thu, 3 Feb 2022 17:03:23 GMT Message-Id: <202202031703.213H3NtC039906@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: d43255b50c2b - main - remove dead code 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: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d43255b50c2bfb00452d0b2f0edafb8a38cf79b3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643907803; 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=jS2hGItYGJr/faI4w7YKkxtL529V9j9OhranfkXlrkw=; b=lyEn2jpqghcpIpCUhFfSGCpjmmJjk+E4bYt+hzdzW1l5Lug9rRJvsp9cy1ytvLajSnqQMX lp1adbJAJAMuXGnr8UkL85k1FibrRD8CuAAhJqmspBO8+Ga349SOscGDVDtkLag0itr9IF Ca1vNalSTrDqnZb80gIn78PuAn9rfaTk2qeM2HIMKe+UJFlEuLLfdHZOf1PjGMtaKIHMvi +fRI/FK06l30wHzhnZs+RtbAprnm7QmOFrVWPWQxuJcGi8JSWXxJMurw9qamn7cNIs3Qrc w6rlM7Wp9AUir5y/G5d1BtMUFiTxZLpKQ13BKZMhLwVaHEWxRhbB5b02cnqFew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643907803; a=rsa-sha256; cv=none; b=BVt/2Bpnf13u1+mi/4NBRyEAfuVZi8w+yA0Yi0sLb20V/RCkwHyrRvFL97GA4/Dpe8HGC0 AMPsAWn72/mzFhhBroQTcRk/bFzANtboWEyO78Od61YxO21MK8+MT7AgQCIinjMri2vAVZ AQOLu3GNvKVVHPLdfzUSIYi+7oJK4B4TQQsEeGGloX7coqpIwi77wQsxmaJaevKpjyc4ds QMWCasPd0lhTXD2wlCrGgDCD0aJqs6+ZUFZIjyG/2o57aelB9fgzY9dxdG89h32l78aryD NLvgXo4ZQYhppL2+w0UfYLmqd/CqXIY217TOCvfcsyMVu01sIeuEqRtM/qspHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=d43255b50c2bfb00452d0b2f0edafb8a38cf79b3 commit d43255b50c2bfb00452d0b2f0edafb8a38cf79b3 Author: Wolfram Schneider AuthorDate: 2022-02-03 17:02:37 +0000 Commit: Wolfram Schneider CommitDate: 2022-02-03 17:02:37 +0000 remove dead code A lookup array is faster than a function with linear search. The old function was not used for years - spring cleaning. --- usr.bin/locate/code/locate.code.c | 37 ++----------------------------------- 1 file changed, 2 insertions(+), 35 deletions(-) diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c index 5263d9ee8fb0..f352cb2e6f6e 100644 --- a/usr.bin/locate/code/locate.code.c +++ b/usr.bin/locate/code/locate.code.c @@ -106,20 +106,12 @@ u_char buf1[LOCATE_PATH_MAX] = " "; u_char buf2[LOCATE_PATH_MAX]; u_char bigrams[BGBUFSIZE + 1] = { 0 }; -#define LOOKUP 1 /* use a lookup array instead a function, 3x faster */ - -#ifdef LOOKUP +/* use a lookup array instead a function, 3x faster than linear search */ #define BGINDEX(x) (big[(u_char)*x][(u_char)*(x + 1)]) typedef short bg_t; bg_t big[UCHAR_MAX + 1][UCHAR_MAX + 1]; -#else -#define BGINDEX(x) bgindex(x) -typedef int bg_t; -int bgindex(char *); -#endif /* LOOKUP */ - -void usage(void); +void usage(void); int main(int argc, char *argv[]) @@ -153,7 +145,6 @@ main(int argc, char *argv[]) err(1, "stdout"); (void)fclose(fp); -#ifdef LOOKUP /* init lookup table */ for (i = 0; i < UCHAR_MAX + 1; i++) for (j = 0; j < UCHAR_MAX + 1; j++) @@ -162,8 +153,6 @@ main(int argc, char *argv[]) for (cp = bigrams, i = 0; *cp != '\0'; i += 2, cp += 2) big[(u_char)*cp][(u_char)*(cp + 1)] = (bg_t)i; -#endif /* LOOKUP */ - oldpath = buf1; path = buf2; oldcount = 0; @@ -176,13 +165,6 @@ main(int argc, char *argv[]) /* remove newline */ for (cp = path; *cp != '\0'; cp++) { -#ifndef LOCATE_CHAR30 - /* old locate implementations core'd for char 30 */ - if (*cp == SWITCH) - *cp = '?'; - else -#endif /* !LOCATE_CHAR30 */ - /* chop newline */ if (*cp == '\n') *cp = '\0'; @@ -257,21 +239,6 @@ main(int argc, char *argv[]) exit(0); } -#ifndef LOOKUP -int -bgindex(char *bg) /* Return location of bg in bigrams or -1. */ -{ - char bg0, bg1, *p; - - bg0 = bg[0]; - bg1 = bg[1]; - for (p = bigrams; *p != NULL; p++) - if (*p++ == bg0 && *p == bg1) - break; - return (*p == NULL ? -1 : (--p - bigrams)); -} -#endif /* !LOOKUP */ - void usage(void) {