proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-28 15:58:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

odb: Do not pass around a header when hashing

Browse Source
This commit is contained in:
Vicent Marti 2011-08-16 13:05:05 +02:00
parent 7adba5f49c
commit c85e08b1bd
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/indexer.c
View File

@ -322,8 +322,7 @@ int git_indexer_run(git_indexer *idx, git_indexer_stats *stats)
git_oid oid;
struct git_pack_entry *pentry;
git_mwindow *w = NULL;
char hdr[512] = {0}; /* FIXME: How long should this be? */
int i, hdr_len;
int i;
off_t entry_start = off;
void *packed;
size_t entry_size;
@ -345,7 +344,7 @@ int git_indexer_run(git_indexer *idx, git_indexer_stats *stats)
}
/* FIXME: Parse the object instead of hashing it */
error = git_odb__hash_obj(&oid, hdr, sizeof(hdr), &hdr_len, &obj);
error = git_odb__hash_obj(&oid, &obj);
if (error < GIT_SUCCESS) {
error = git__rethrow(error, "Failed to hash object");
goto cleanup;

17
src/odb.c
View File

@ -59,12 +59,13 @@ static int format_object_header(char *hdr, size_t n, size_t obj_len, git_otype o
return len+1;
}
int git_odb__hash_obj(git_oid *id, char *hdr, size_t n, int *len, git_rawobj *obj)
int git_odb__hash_obj(git_oid *id, git_rawobj *obj)
{
git_buf_vec vec[2];
int hdrlen;
char header[64];
int hdrlen;
assert(id && hdr && len && obj);
assert(id && obj);
if (!git_object_typeisloose(obj->type))
return git__throw(GIT_ERROR, "Failed to hash object. Wrong object type");
@ -72,12 +73,10 @@ int git_odb__hash_obj(git_oid *id, char *hdr, size_t n, int *len, git_rawobj *ob
if (!obj->data && obj->len != 0)
return git__throw(GIT_ERROR, "Failed to hash object. No data given");
if ((hdrlen = format_object_header(hdr, n, obj->len, obj->type)) < 0)
if ((hdrlen = format_object_header(header, sizeof(header), obj->len, obj->type)) < 0)
return git__rethrow(hdrlen, "Failed to hash object");
*len = hdrlen;
vec[0].data = hdr;
vec[0].data = header;
vec[0].len = hdrlen;
vec[1].data = obj->data;
vec[1].len = obj->len;
@ -182,8 +181,6 @@ int git_odb_hashfile(git_oid *out, const char *path, git_otype type)
int git_odb_hash(git_oid *id, const void *data, size_t len, git_otype type)
{
char hdr[64];
int hdrlen;
git_rawobj raw;
assert(id);
@ -192,7 +189,7 @@ int git_odb_hash(git_oid *id, const void *data, size_t len, git_otype type)
raw.len = len;
raw.type = type;
return git_odb__hash_obj(id, hdr, sizeof(hdr), &hdrlen, &raw);
return git_odb__hash_obj(id, &raw);
}
/**

2
src/odb.h
View File

@ -28,6 +28,6 @@ struct git_odb {
git_cache cache;
};
int git_odb__hash_obj(git_oid *id, char *hdr, size_t n, int *len, git_rawobj *obj);
int git_odb__hash_obj(git_oid *id, git_rawobj *obj);
#endif