From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: git@vger.kernel.org, "Jeff King" <peff@peff.net>,
"Derrick Stolee" <stolee@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH v2 02/13] sha1-file: provide functions to look up hash algorithms
Date: Wed, 17 Oct 2018 15:32:20 +0200 [thread overview]
Message-ID: <20181017133220.GQ19800@szeder.dev> (raw)
In-Reply-To: <20181015021900.1030041-3-sandals@crustytoothpaste.net>
On Mon, Oct 15, 2018 at 02:18:49AM +0000, brian m. carlson wrote:
> There are several ways we might refer to a hash algorithm: by name, such
> as in the config file; by format ID, such as in a pack; or internally,
> by a pointer to the hash_algos array. Provide functions to look up hash
> algorithms based on these various forms and return the internal constant
> used for them. If conversion to another form is necessary, this
> internal constant can be used to look up the proper data in the
> hash_algos array.
>
> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
> ---
> hash.h | 13 +++++++++++++
> sha1-file.c | 21 +++++++++++++++++++++
> 2 files changed, 34 insertions(+)
>
> diff --git a/hash.h b/hash.h
> index 7c8238bc2e..90f4344619 100644
> --- a/hash.h
> +++ b/hash.h
> @@ -98,4 +98,17 @@ struct git_hash_algo {
> };
> extern const struct git_hash_algo hash_algos[GIT_HASH_NALGOS];
>
> +/*
> + * Return a GIT_HASH_* constant based on the name. Returns GIT_HASH_UNKNOWN if
> + * the name doesn't match a known algorithm.
> + */
> +int hash_algo_by_name(const char *name);
> +/* Identical, except based on the format ID. */
> +int hash_algo_by_id(uint32_t format_id);
> +/* Identical, except for a pointer to struct git_hash_algo. */
> +inline int hash_algo_by_ptr(const struct git_hash_algo *p)
This has to be declared as static, otherwise the linker will error out
when building without optimization:
LINK git
libgit.a(commit-graph.o): In function `oid_version':
/home/szeder/src/git/commit-graph.c:48: undefined reference to `hash_algo_by_ptr'
libgit.a(hex.o): In function `hash_to_hex':
/home/szeder/src/git/hex.c:123: undefined reference to `hash_algo_by_ptr'
libgit.a(hex.o): In function `oid_to_hex':
/home/szeder/src/git/hex.c:128: undefined reference to `hash_algo_by_ptr'
collect2: error: ld returned 1 exit status
Makefile:2055: recipe for target 'git' failed
make: *** [git] Error 1
> +{
> + return p - hash_algos;
> +}
> +
> #endif
> diff --git a/sha1-file.c b/sha1-file.c
> index e29825f259..3a75d515eb 100644
> --- a/sha1-file.c
> +++ b/sha1-file.c
> @@ -122,6 +122,27 @@ const char *empty_blob_oid_hex(void)
> return oid_to_hex_r(buf, the_hash_algo->empty_blob);
> }
>
> +int hash_algo_by_name(const char *name)
> +{
> + int i;
> + if (!name)
> + return GIT_HASH_UNKNOWN;
> + for (i = 1; i < GIT_HASH_NALGOS; i++)
> + if (!strcmp(name, hash_algos[i].name))
> + return i;
> + return GIT_HASH_UNKNOWN;
> +}
> +
> +int hash_algo_by_id(uint32_t format_id)
> +{
> + int i;
> + for (i = 1; i < GIT_HASH_NALGOS; i++)
> + if (format_id == hash_algos[i].format_id)
> + return i;
> + return GIT_HASH_UNKNOWN;
> +}
> +
> +
> /*
> * This is meant to hold a *small* number of objects that you would
> * want read_sha1_file() to be able to return, but yet you do not want
next prev parent reply other threads:[~2018-10-17 13:32 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-15 2:18 [PATCH v2 00/13] Base SHA-256 implementation brian m. carlson
2018-10-15 2:18 ` [PATCH v2 01/13] sha1-file: rename algorithm to "sha1" brian m. carlson
2018-10-16 15:17 ` Duy Nguyen
2018-10-17 22:53 ` brian m. carlson
2018-10-15 2:18 ` [PATCH v2 02/13] sha1-file: provide functions to look up hash algorithms brian m. carlson
2018-10-17 13:32 ` SZEDER Gábor [this message]
2018-10-15 2:18 ` [PATCH v2 03/13] hex: introduce functions to print arbitrary hashes brian m. carlson
2018-10-16 1:54 ` Junio C Hamano
2018-10-17 23:49 ` brian m. carlson
2018-10-15 2:18 ` [PATCH v2 04/13] cache: make hashcmp and hasheq work with larger hashes brian m. carlson
2018-10-16 15:44 ` Duy Nguyen
2018-10-15 2:18 ` [PATCH v2 05/13] t: add basic tests for our SHA-1 implementation brian m. carlson
2018-10-15 2:18 ` [PATCH v2 06/13] t: make the sha1 test-tool helper generic brian m. carlson
2018-10-15 2:18 ` [PATCH v2 07/13] sha1-file: add a constant for hash block size brian m. carlson
2018-10-15 2:18 ` [PATCH v2 08/13] t/helper: add a test helper to compute hash speed brian m. carlson
2018-10-15 2:18 ` [PATCH v2 09/13] commit-graph: convert to using the_hash_algo brian m. carlson
2018-10-15 15:10 ` Derrick Stolee
2018-10-15 2:18 ` [PATCH v2 10/13] Add a base implementation of SHA-256 support brian m. carlson
2018-10-15 14:59 ` Duy Nguyen
2018-10-15 23:30 ` brian m. carlson
2018-10-16 14:59 ` Duy Nguyen
2018-10-17 16:12 ` SZEDER Gábor
2018-10-17 23:04 ` brian m. carlson
2018-10-15 2:18 ` [PATCH v2 11/13] sha256: add an SHA-256 implementation using libgcrypt brian m. carlson
2018-10-15 2:18 ` [PATCH v2 12/13] hash: add an SHA-256 implementation using OpenSSL brian m. carlson
2018-10-16 15:36 ` Duy Nguyen
2018-10-15 2:19 ` [PATCH v2 13/13] commit-graph: specify OID version for SHA-256 brian m. carlson
2018-10-15 15:11 ` Derrick Stolee
2018-10-16 2:00 ` Junio C Hamano
2018-10-16 22:39 ` brian m. carlson
2018-10-16 15:35 ` Duy Nguyen
2018-10-16 16:01 ` Derrick Stolee
2018-10-16 16:09 ` Duy Nguyen
2018-10-16 22:44 ` brian m. carlson
2018-10-17 14:31 ` Duy Nguyen
2018-10-18 0:06 ` brian m. carlson
2018-10-18 13:03 ` Derrick Stolee
2018-10-19 22:21 ` brian m. carlson
2018-10-17 12:21 ` Derrick Stolee
2018-10-17 22:38 ` brian m. carlson
2018-10-16 2:00 ` [PATCH v2 00/13] Base SHA-256 implementation Junio C Hamano
2018-10-16 4:01 ` Junio C Hamano
2018-10-16 22:45 ` brian m. carlson
2018-10-16 15:39 ` Duy Nguyen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181017133220.GQ19800@szeder.dev \
--to=szeder.dev@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
--cc=stolee@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).