summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Schubert <schu@schu.io>2013-02-26 01:03:56 +0100
committerMichael Schubert <schu@schu.io>2013-02-26 01:08:34 +0100
commit8005c6d420a2d8f00d96c1c0a385db91c88613c0 (patch)
tree64a800fed99465a16f88e903964b7d940feba8b6 /src
parentf657688bc7616b189ea455ade4c8a4909e2786d8 (diff)
downloadlibgit2-8005c6d420a2d8f00d96c1c0a385db91c88613c0.tar.gz
Revert "hash: remove git_hash_init from internal api"
This reverts commit efe7fad6c96a3d6197a218aeaa561ec676794499, except for the indentation fixes.
Diffstat (limited to 'src')
-rw-r--r--src/hash.h1
-rw-r--r--src/hash/hash_generic.c2
-rw-r--r--src/hash/hash_generic.h1
-rw-r--r--src/hash/hash_win32.c4
4 files changed, 5 insertions, 3 deletions
diff --git a/src/hash.h b/src/hash.h
index dc9a79e20..5b848981f 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -31,6 +31,7 @@ typedef struct {
size_t len;
} git_buf_vec;
+int git_hash_init(git_hash_ctx *c);
int git_hash_update(git_hash_ctx *c, const void *data, size_t len);
int git_hash_final(git_oid *out, git_hash_ctx *c);
diff --git a/src/hash/hash_generic.c b/src/hash/hash_generic.c
index e496d1f5e..32fcd869c 100644
--- a/src/hash/hash_generic.c
+++ b/src/hash/hash_generic.c
@@ -221,7 +221,7 @@ static void hash__block(git_hash_ctx *ctx, const unsigned int *data)
ctx->H[4] += E;
}
-int git_hash_ctx_init(git_hash_ctx *ctx)
+int git_hash_init(git_hash_ctx *ctx)
{
ctx->size = 0;
diff --git a/src/hash/hash_generic.h b/src/hash/hash_generic.h
index bebf2c27e..b731de8b3 100644
--- a/src/hash/hash_generic.h
+++ b/src/hash/hash_generic.h
@@ -18,6 +18,7 @@ struct git_hash_ctx {
#define git_hash_global_init() 0
#define git_hash_global_shutdown() /* noop */
+#define git_hash_ctx_init(ctx) git_hash_init(ctx)
#define git_hash_ctx_cleanup(ctx)
#endif /* INCLUDE_hash_generic_h__ */
diff --git a/src/hash/hash_win32.c b/src/hash/hash_win32.c
index 3be3ba87a..43d54ca6d 100644
--- a/src/hash/hash_win32.c
+++ b/src/hash/hash_win32.c
@@ -134,7 +134,7 @@ GIT_INLINE(int) hash_ctx_cryptoapi_init(git_hash_ctx *ctx)
ctx->type = CRYPTOAPI;
ctx->prov = &hash_prov;
- return git_hash_ctx_init(ctx);
+ return git_hash_init(ctx);
}
GIT_INLINE(int) hash_cryptoapi_init(git_hash_ctx *ctx)
@@ -262,7 +262,7 @@ int git_hash_ctx_init(git_hash_ctx *ctx)
return (hash_prov.type == CNG) ? hash_ctx_cng_init(ctx) : hash_ctx_cryptoapi_init(ctx);
}
-int git_hash_ctx_init(git_hash_ctx *ctx)
+int git_hash_init(git_hash_ctx *ctx)
{
assert(ctx && ctx->type);
return (ctx->type == CNG) ? hash_cng_init(ctx) : hash_cryptoapi_init(ctx);