diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2021-09-29 21:02:38 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2021-10-01 08:12:07 -0400 |
| commit | 3fff59705fec852b97639364ca7b3e84ff7040b7 (patch) | |
| tree | af13eef3493a9784b6e96c26690d47e34fef7190 | |
| parent | b7bad55e4bb0a285b073ba5e02b01d3f522fc95d (diff) | |
| download | libgit2-3fff59705fec852b97639364ca7b3e84ff7040b7.tar.gz | |
hash: don't abbreviate algorithm
| -rw-r--r-- | src/hash.c | 18 | ||||
| -rw-r--r-- | src/hash.h | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/hash.c b/src/hash.c index 5a7278e42..d56c77221 100644 --- a/src/hash.c +++ b/src/hash.c @@ -19,15 +19,15 @@ int git_hash_ctx_init(git_hash_ctx *ctx) if ((error = git_hash_sha1_ctx_init(&ctx->ctx.sha1)) < 0) return error; - ctx->algo = GIT_HASH_ALGO_SHA1; + ctx->algorithm = GIT_HASH_ALGORITHM_SHA1; return 0; } void git_hash_ctx_cleanup(git_hash_ctx *ctx) { - switch (ctx->algo) { - case GIT_HASH_ALGO_SHA1: + switch (ctx->algorithm) { + case GIT_HASH_ALGORITHM_SHA1: git_hash_sha1_ctx_cleanup(&ctx->ctx.sha1); return; default: @@ -37,8 +37,8 @@ void git_hash_ctx_cleanup(git_hash_ctx *ctx) int git_hash_init(git_hash_ctx *ctx) { - switch (ctx->algo) { - case GIT_HASH_ALGO_SHA1: + switch (ctx->algorithm) { + case GIT_HASH_ALGORITHM_SHA1: return git_hash_sha1_init(&ctx->ctx.sha1); default: /* unreachable */ ; @@ -49,8 +49,8 @@ int git_hash_init(git_hash_ctx *ctx) int git_hash_update(git_hash_ctx *ctx, const void *data, size_t len) { - switch (ctx->algo) { - case GIT_HASH_ALGO_SHA1: + switch (ctx->algorithm) { + case GIT_HASH_ALGORITHM_SHA1: return git_hash_sha1_update(&ctx->ctx.sha1, data, len); default: /* unreachable */ ; @@ -61,8 +61,8 @@ int git_hash_update(git_hash_ctx *ctx, const void *data, size_t len) int git_hash_final(git_oid *out, git_hash_ctx *ctx) { - switch (ctx->algo) { - case GIT_HASH_ALGO_SHA1: + switch (ctx->algorithm) { + case GIT_HASH_ALGORITHM_SHA1: return git_hash_sha1_final(out, &ctx->ctx.sha1); default: /* unreachable */ ; diff --git a/src/hash.h b/src/hash.h index 87305cc79..31a31b325 100644 --- a/src/hash.h +++ b/src/hash.h @@ -18,9 +18,9 @@ typedef struct { } git_buf_vec; typedef enum { - GIT_HASH_ALGO_UNKNOWN = 0, - GIT_HASH_ALGO_SHA1, -} git_hash_algo_t; + GIT_HASH_ALGORITHM_NONE = 0, + GIT_HASH_ALGORITHM_SHA1 +} git_hash_algorithm_t; #include "hash/sha1.h" @@ -28,7 +28,7 @@ typedef struct git_hash_ctx { union { git_hash_sha1_ctx sha1; } ctx; - git_hash_algo_t algo; + git_hash_algorithm_t algorithm; } git_hash_ctx; int git_hash_global_init(void); |