hash.h: drop unsafe_ function variants

Now that all callers have been converted from:

    the_hash_algo->unsafe_init_fn();

to

    unsafe_hash_algo(the_hash_algo)->init_fn();

and similar, we can remove the scaffolding for the unsafe_ function
variants and force callers to use the new unsafe_hash_algo() mechanic
instead.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/hash.h b/hash.h
index 0bf63cedfa492454e5e37224f8a9d2edab5041f2..ad2c919991c884f0e563aa4416c5c004349582fe 100644 (file)
--- a/hash.h
+++ b/hash.h
@@ -282,21 +282,6 @@ struct git_hash_algo {
        /* The hash finalization function for object IDs. */
        git_hash_final_oid_fn final_oid_fn;
 
-       /* The non-cryptographic hash initialization function. */
-       git_hash_init_fn unsafe_init_fn;
-
-       /* The non-cryptographic hash context cloning function. */
-       git_hash_clone_fn unsafe_clone_fn;
-
-       /* The non-cryptographic hash update function. */
-       git_hash_update_fn unsafe_update_fn;
-
-       /* The non-cryptographic hash finalization function. */
-       git_hash_final_fn unsafe_final_fn;
-
-       /* The non-cryptographic hash finalization function. */
-       git_hash_final_oid_fn unsafe_final_oid_fn;
-
        /* The OID of the empty tree. */
        const struct object_id *empty_tree;
 

diff --git a/object-file.c b/object-file.c
index 43efa4ca3619ee989c40ef39aa5db4b709b59735..c4b42dd4be987352676ed49a9c6260dec3e4af24 100644 (file)
--- a/object-file.c
+++ b/object-file.c
@@ -230,11 +230,6 @@ const struct git_hash_algo hash_algos[GIT_HASH_NALGOS] = {
                .update_fn = git_hash_unknown_update,
                .final_fn = git_hash_unknown_final,
                .final_oid_fn = git_hash_unknown_final_oid,
-               .unsafe_init_fn = git_hash_unknown_init,
-               .unsafe_clone_fn = git_hash_unknown_clone,
-               .unsafe_update_fn = git_hash_unknown_update,
-               .unsafe_final_fn = git_hash_unknown_final,
-               .unsafe_final_oid_fn = git_hash_unknown_final_oid,
                .empty_tree = NULL,
                .empty_blob = NULL,
                .null_oid = NULL,
@@ -250,11 +245,6 @@ const struct git_hash_algo hash_algos[GIT_HASH_NALGOS] = {
                .update_fn = git_hash_sha1_update,
                .final_fn = git_hash_sha1_final,
                .final_oid_fn = git_hash_sha1_final_oid,
-               .unsafe_init_fn = git_hash_sha1_init_unsafe,
-               .unsafe_clone_fn = git_hash_sha1_clone_unsafe,
-               .unsafe_update_fn = git_hash_sha1_update_unsafe,
-               .unsafe_final_fn = git_hash_sha1_final_unsafe,
-               .unsafe_final_oid_fn = git_hash_sha1_final_oid_unsafe,
                .unsafe = &sha1_unsafe_algo,
                .empty_tree = &empty_tree_oid,
                .empty_blob = &empty_blob_oid,
@@ -271,11 +261,6 @@ const struct git_hash_algo hash_algos[GIT_HASH_NALGOS] = {
                .update_fn = git_hash_sha256_update,
                .final_fn = git_hash_sha256_final,
                .final_oid_fn = git_hash_sha256_final_oid,
-               .unsafe_init_fn = git_hash_sha256_init,
-               .unsafe_clone_fn = git_hash_sha256_clone,
-               .unsafe_update_fn = git_hash_sha256_update,
-               .unsafe_final_fn = git_hash_sha256_final,
-               .unsafe_final_oid_fn = git_hash_sha256_final_oid,
                .empty_tree = &empty_tree_oid_sha256,
                .empty_blob = &empty_blob_oid_sha256,
                .null_oid = &null_oid_sha256,