From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AFF14C7EE24 for ; Tue, 16 May 2023 06:34:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230384AbjEPGey (ORCPT ); Tue, 16 May 2023 02:34:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230270AbjEPGeh (ORCPT ); Tue, 16 May 2023 02:34:37 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 979D135A4 for ; Mon, 15 May 2023 23:34:26 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3078a3f3b5fso10664186f8f.0 for ; Mon, 15 May 2023 23:34:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684218866; x=1686810866; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=I6dG7AlPVVznMsyldRUr8JW9bbpEOQeRtR0Onz6ehVQ=; b=bu/jszZrmK15JHbjuGQStNH/NI8SQngZ2s7aM5vS4+sh31vu6dYARp8Pb+r5pYRMNB 5S5YGOSV8M6TLX9siZUbtLj5XFF8GROMyRkAFwqFZ6K4qINagvfYzXgQ3ud9HoRrkAJa FxPWRbmH/wFXNQTA08XXrY64r4kPoCTMYDnoCy/zUsDZ0ghRowpTXNERSpOL9o10NGEF 33y+LF/hC8Ym/pMYN05fsmKSd1750lCcewWvKE6QeAI1TZtFnbvGixc0jxtOUn6PJnDo xkLNgYc1RrE/LuXe9mWk3oCIKBB6zTn3hDu7Gw095SBDXqHJREIWuBoxfMaZslHwgKEL j3RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684218866; x=1686810866; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I6dG7AlPVVznMsyldRUr8JW9bbpEOQeRtR0Onz6ehVQ=; b=CcEbN7FCRypPKnYNAtVDTc7ncY1sQ6Id3Z/614hbRWemUXNzp8NZ03sAYO31Im49bC 1HubZagvEg8EFS11Xy+E4PL4D2hwUArr7ZAtWUSQO7SghVl78UP/1Qtt5ZYvCIivJhQ1 YL5njH0iUJ5/wqY3U6F+laa8vC+GbdD6MIy3IZVCGoPQdl6t56iyhJm5+TDrZTkRInPO 1c2SBMexshakghGeAugV+OUV9dqhBtak3hV2plaZoHxXcgtFlY3b1NkGNfTOKjz784EP I8aWITmM8APKq+zH0dg5bbcrOW1aORpDBKya4rbvK5Pmc9vGV8nCUmiduXp7/satqhd4 /sNA== X-Gm-Message-State: AC+VfDwCTKvThS7LgJ2gWWXuXtDlBdEZSQY6a7fYXtJfDDvXg+j72MAi o0QBlq3a47rgleyZ++P9LHqJ3arL+iw= X-Google-Smtp-Source: ACHHUZ5Wd04T+n5Qe31vRu3Xh+9QxjJIaFMMPwZOPFTGtwITK8WRCDVNN3Bi1oIfO7ItbyHV6isTOw== X-Received: by 2002:a5d:6b41:0:b0:307:14a6:ef97 with SMTP id x1-20020a5d6b41000000b0030714a6ef97mr26223189wrw.67.1684218865863; Mon, 15 May 2023 23:34:25 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id d12-20020a5d644c000000b003062c0ef959sm1368198wrw.69.2023.05.15.23.34.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 May 2023 23:34:25 -0700 (PDT) Message-Id: In-Reply-To: References: From: "Elijah Newren via GitGitGadget" Date: Tue, 16 May 2023 06:33:50 +0000 Subject: [PATCH v3 10/28] name-hash.h: move declarations for name-hash.c from cache.h Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , Calvin Wan , Jeff King , Glen Choo , Jonathan Tan , Elijah Newren , Elijah Newren Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Elijah Newren Signed-off-by: Elijah Newren --- apply.c | 1 + builtin/mv.c | 1 + cache.h | 9 --------- dir.c | 1 + entry.c | 1 + merge-recursive.c | 1 + name-hash.c | 1 + name-hash.h | 16 ++++++++++++++++ read-cache.c | 1 + sparse-index.c | 1 + t/helper/test-lazy-init-name-hash.c | 1 + unpack-trees.c | 1 + 12 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 name-hash.h diff --git a/apply.c b/apply.c index 6212ab3a1b3..3da33bb88fd 100644 --- a/apply.c +++ b/apply.c @@ -23,6 +23,7 @@ #include "xdiff-interface.h" #include "ll-merge.h" #include "lockfile.h" +#include "name-hash.h" #include "object-name.h" #include "object-file.h" #include "parse-options.h" diff --git a/builtin/mv.c b/builtin/mv.c index 665bd274485..e058b574654 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -11,6 +11,7 @@ #include "config.h" #include "environment.h" #include "gettext.h" +#include "name-hash.h" #include "object-file.h" #include "pathspec.h" #include "lockfile.h" diff --git a/cache.h b/cache.h index d31b1515069..316904da392 100644 --- a/cache.h +++ b/cache.h @@ -245,12 +245,6 @@ struct index_state { void index_state_init(struct index_state *istate, struct repository *r); void release_index(struct index_state *istate); -/* Name hashing */ -int test_lazy_init_name_hash(struct index_state *istate, int try_threaded); -void add_name_hash(struct index_state *istate, struct cache_entry *ce); -void remove_name_hash(struct index_state *istate, struct cache_entry *ce); -void free_name_hash(struct index_state *istate); - /* Cache entry creation and cleanup */ /* @@ -377,9 +371,6 @@ int repo_index_has_changes(struct repository *repo, int verify_path(const char *path, unsigned mode); int strcmp_offset(const char *s1, const char *s2, size_t *first_change); -int index_dir_exists(struct index_state *istate, const char *name, int namelen); -void adjust_dirname_case(struct index_state *istate, char *name); -struct cache_entry *index_file_exists(struct index_state *istate, const char *name, int namelen, int igncase); /* * Searches for an entry defined by name and namelen in the given index. diff --git a/dir.c b/dir.c index a7469df3ac7..029aab36fe8 100644 --- a/dir.c +++ b/dir.c @@ -13,6 +13,7 @@ #include "dir.h" #include "environment.h" #include "gettext.h" +#include "name-hash.h" #include "object-file.h" #include "object-store.h" #include "attr.h" diff --git a/entry.c b/entry.c index 91a540bd29f..7791cc999cc 100644 --- a/entry.c +++ b/entry.c @@ -5,6 +5,7 @@ #include "environment.h" #include "gettext.h" #include "hex.h" +#include "name-hash.h" #include "streaming.h" #include "submodule.h" #include "symlinks.h" diff --git a/merge-recursive.c b/merge-recursive.c index 8e87b6386d9..b341ba4f38d 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -23,6 +23,7 @@ #include "ll-merge.h" #include "lockfile.h" #include "match-trees.h" +#include "name-hash.h" #include "object-file.h" #include "object-name.h" #include "object-store.h" diff --git a/name-hash.c b/name-hash.c index fb13716e430..52ce47ea394 100644 --- a/name-hash.c +++ b/name-hash.c @@ -8,6 +8,7 @@ #include "cache.h" #include "environment.h" #include "gettext.h" +#include "name-hash.h" #include "thread-utils.h" #include "trace.h" #include "trace2.h" diff --git a/name-hash.h b/name-hash.h new file mode 100644 index 00000000000..b1b4b0fb337 --- /dev/null +++ b/name-hash.h @@ -0,0 +1,16 @@ +#ifndef NAME_HASH_H +#define NAME_HASH_H + +struct cache_entry; +struct index_state; + +int index_dir_exists(struct index_state *istate, const char *name, int namelen); +void adjust_dirname_case(struct index_state *istate, char *name); +struct cache_entry *index_file_exists(struct index_state *istate, const char *name, int namelen, int igncase); + +int test_lazy_init_name_hash(struct index_state *istate, int try_threaded); +void add_name_hash(struct index_state *istate, struct cache_entry *ce); +void remove_name_hash(struct index_state *istate, struct cache_entry *ce); +void free_name_hash(struct index_state *istate); + +#endif /* NAME_HASH_H */ diff --git a/read-cache.c b/read-cache.c index b99dbfd16b0..e1016ae0317 100644 --- a/read-cache.c +++ b/read-cache.c @@ -25,6 +25,7 @@ #include "environment.h" #include "gettext.h" #include "mem-pool.h" +#include "name-hash.h" #include "object-name.h" #include "resolve-undo.h" #include "revision.h" diff --git a/sparse-index.c b/sparse-index.c index 886054729e5..60451daae80 100644 --- a/sparse-index.c +++ b/sparse-index.c @@ -2,6 +2,7 @@ #include "alloc.h" #include "environment.h" #include "gettext.h" +#include "name-hash.h" #include "repository.h" #include "sparse-index.h" #include "tree.h" diff --git a/t/helper/test-lazy-init-name-hash.c b/t/helper/test-lazy-init-name-hash.c index b83a75d19f6..6944b7e825f 100644 --- a/t/helper/test-lazy-init-name-hash.c +++ b/t/helper/test-lazy-init-name-hash.c @@ -2,6 +2,7 @@ #include "test-tool.h" #include "cache.h" #include "environment.h" +#include "name-hash.h" #include "parse-options.h" #include "repository.h" #include "setup.h" diff --git a/unpack-trees.c b/unpack-trees.c index e8c32a40dcb..078c53f7a13 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -7,6 +7,7 @@ #include "environment.h" #include "gettext.h" #include "hex.h" +#include "name-hash.h" #include "tree.h" #include "tree-walk.h" #include "cache-tree.h" -- gitgitgadget