From nobody Tue Mar 24 10:38:08 2026 X-Original-To: dev-commits-src-main@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 4fg62924GDz6WTqQ for ; Tue, 24 Mar 2026 10:38:09 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fg6290Y0rz3sKT for ; Tue, 24 Mar 2026 10:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774348689; 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=Vcqo5/xMiaWNYCl/XN9gfQxOuR4HgCfIAAqjT9wNq+0=; b=AxIZJOov0vzjPOnmqoBsnqHA8p2hUU3YAL3+Kta4jghhmfofRCe13j3fRIsxJNRfDIykjr j+QPWEZ9BmdXgNV4+dWmLfBXRrAUpS1hWQvfyuhAlAelvVKBEhnd2qmnrZJkngWhtcKRz5 VT9hM3w46oaLiSd4fL0bhw+gQOLdZPM7fHpFQhWDYnP6Hy1JVtnCDEzN/Q6+CVmh9ZeoBj 0nZWDuFHWpS/Zx+xetogsaIbOjpV1Q9TRoG6un18gmkL629lHxtrTK+Grjb/3gVZt9HMCD SjcTrnLrns0fDs2RTjGKpF9wbpo0Z0/3mhePiILmrLHMxrvBapg/837vry178g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774348689; a=rsa-sha256; cv=none; b=gIpl/zAnIYaB2Q0sq+oUT5qK/V/SO59duK94ZWm6OfTXBoaBiwhDNeLynYfLGlGssNoSdi 2/CvKIAtZ+0rB99camuGkD5QdZQXuBHUPEoTkMwzPGstIcgbdHefTX9BHZvZuqvliQchZa ewOGZI+x3Z/WeJCEx5FCtdAIdhVG1JjGp/9sJIbg9S2nK/10tm0ozpPW3HzqZYtgL9tdZY awhZtsfqXLA+zNCNfFurwoughwxfFD6XYQR0DDpXiUeCdkJ+nGVWwJH368t5qIQeytb9UR Bs+8z8JV0e39pqkaoKCpgYbg/ou6s1+ufi1tjTu126RUvU1IvdI7vgl8BFWnMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774348689; 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=Vcqo5/xMiaWNYCl/XN9gfQxOuR4HgCfIAAqjT9wNq+0=; b=jmKLBofvC0534Qvmh8G95rdkNikG+Hm+kzFyJEsjpAARDYmiuAivm7AI4tWj7Vcj40BJtp cF8ZOZFStdU4Ucxj+P3Qr/Rg6DXllVZ++MGbJpV4zdDOkrmS15fck4cq9dlWwqrDXppwPt c84FNgLPEnT4lQQSXGcG1X1obRvwengrk6TcWZKKFo+S5KflVTC8FgPqviAyszP5AcKKtG FaGUSEEn0YdU8mC+5DLarMuN7SnadrEe3eI+iJOi1PaupoS5xeqgkOYOF/PrcXdxTp2ZC4 bBZ9b21PlvBn5ra5KvqwDcO4MxLdlzgYftKX5gBD28A9ZK8upWNeoJCU60bfuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fg628755zzdQ for ; Tue, 24 Mar 2026 10:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 336a7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Mar 2026 10:38:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan Novk=?utf-8?Q?ovi=C4=87?= Subject: git: c09ccfc2665b - main - libc/db: Remove unused hash functions in hash_func.c List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c09ccfc2665bef0d81d1db4e3713e4f2a0b5a064 Auto-Submitted: auto-generated Date: Tue, 24 Mar 2026 10:38:08 +0000 Message-Id: <69c26990.336a7.5610b64d@gitrepo.freebsd.org> The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=c09ccfc2665bef0d81d1db4e3713e4f2a0b5a064 commit c09ccfc2665bef0d81d1db4e3713e4f2a0b5a064 Author: Bojan Novković AuthorDate: 2026-03-13 11:03:26 +0000 Commit: Bojan Novković CommitDate: 2026-03-24 10:34:55 +0000 libc/db: Remove unused hash functions in hash_func.c Prune unused code hidden behind 'notdef', bringing us in sync with the changes in OpenBSD. Despite the `__default_hash` function pointer having external linkage, no ABI change is expected since it was never exported. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D55842 Reviewed by: allanjude, des MFC after: 2 weeks --- lib/libc/db/hash/extern.h | 2 +- lib/libc/db/hash/hash_func.c | 107 +------------------------------------------ 2 files changed, 2 insertions(+), 107 deletions(-) diff --git a/lib/libc/db/hash/extern.h b/lib/libc/db/hash/extern.h index d3850752ad3a..690219d30606 100644 --- a/lib/libc/db/hash/extern.h +++ b/lib/libc/db/hash/extern.h @@ -54,7 +54,7 @@ void __reclaim_buf(HTAB *, BUFHEAD *); int __split_page(HTAB *, u_int32_t, u_int32_t); /* Default hash routine. */ -extern u_int32_t (*__default_hash)(const void *, size_t); +u_int32_t __default_hash(const void *, size_t); #ifdef HASH_STATISTICS extern int hash_accesses, hash_collisions, hash_expansions, hash_overflows; diff --git a/lib/libc/db/hash/hash_func.c b/lib/libc/db/hash/hash_func.c index 529180b7698d..29597a04d3c0 100644 --- a/lib/libc/db/hash/hash_func.c +++ b/lib/libc/db/hash/hash_func.c @@ -39,114 +39,9 @@ #include "page.h" #include "extern.h" -#ifdef notdef -static u_int32_t hash1(const void *, size_t) __unused; -static u_int32_t hash2(const void *, size_t) __unused; -static u_int32_t hash3(const void *, size_t) __unused; -#endif -static u_int32_t hash4(const void *, size_t); - -/* Default hash function. */ -u_int32_t (*__default_hash)(const void *, size_t) = hash4; - -#ifdef notdef -/* - * Assume that we've already split the bucket to which this key hashes, - * calculate that bucket, and check that in fact we did already split it. - * - * EJB's original hsearch hash. - */ -#define PRIME1 37 -#define PRIME2 1048583 - -u_int32_t -hash1(const void *key, size_t len) -{ - u_int32_t h; - u_int8_t *k; - - h = 0; - k = (u_int8_t *)key; - /* Convert string to integer */ - while (len--) - h = h * PRIME1 ^ (*k++ - ' '); - h %= PRIME2; - return (h); -} - -/* - * Phong Vo's linear congruential hash - */ -#define dcharhash(h, c) ((h) = 0x63c63cd9*(h) + 0x9c39c33d + (c)) - -u_int32_t -hash2(const void *key, size_t len) -{ - u_int32_t h; - u_int8_t *e, c, *k; - - k = (u_int8_t *)key; - e = k + len; - for (h = 0; k != e;) { - c = *k++; - if (!c && k > e) - break; - dcharhash(h, c); - } - return (h); -} - -/* - * This is INCREDIBLY ugly, but fast. We break the string up into 8 byte - * units. On the first time through the loop we get the "leftover bytes" - * (strlen % 8). On every other iteration, we perform 8 HASHC's so we handle - * all 8 bytes. Essentially, this saves us 7 cmp & branch instructions. If - * this routine is heavily used enough, it's worth the ugly coding. - * - * Ozan Yigit's original sdbm hash. - */ -u_int32_t -hash3(const void *key, size_t len) -{ - u_int32_t n, loop; - u_int8_t *k; - -#define HASHC n = *k++ + 65599 * n - - n = 0; - k = (u_int8_t *)key; - if (len > 0) { - loop = (len + 8 - 1) >> 3; - - switch (len & (8 - 1)) { - case 0: - do { /* All fall throughs */ - HASHC; - case 7: - HASHC; - case 6: - HASHC; - case 5: - HASHC; - case 4: - HASHC; - case 3: - HASHC; - case 2: - HASHC; - case 1: - HASHC; - } while (--loop); - } - - } - return (n); -} -#endif /* notdef */ - /* Chris Torek's hash function. */ u_int32_t -hash4(const void *key, size_t len) +__default_hash(const void *key, size_t len) { u_int32_t h, loop; const u_int8_t *k;