kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

sha1_file: convert hash_sha1_file_literally to struct object_id 

Convert all remaining callers as well.

Signed-off-by: Patryk Obara <patryk.obara@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Patryk Obara 2017-08-20 22:09:30 +02:00 committed by Junio C Hamano
parent e3506559d4
commit da77611d73
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/hash-object.c
View File

@ -24,7 +24,7 @@ static int hash_literally(struct object_id *oid, int fd, const char *type, unsig
if (strbuf_read(&buf, fd, 4096) < 0) if (strbuf_read(&buf, fd, 4096) < 0)
ret = -1; ret = -1;
else else
ret = hash_sha1_file_literally(buf.buf, buf.len, type, oid->hash, flags); ret = hash_sha1_file_literally(buf.buf, buf.len, type, oid, flags);
strbuf_release(&buf); strbuf_release(&buf);
return ret; return ret;
} }

2
cache.h
View File

@ -1199,7 +1199,7 @@ static inline const unsigned char *lookup_replace_object(const unsigned char *sh
extern int sha1_object_info(const unsigned char *, unsigned long *); extern int sha1_object_info(const unsigned char *, unsigned long *);
extern int hash_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1); extern int hash_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1);
extern int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *return_sha1); extern int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *return_sha1);
extern int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type, unsigned char *sha1, unsigned flags); extern int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type, struct object_id *oid, unsigned flags);
extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *); extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *);
extern int force_object_loose(const unsigned char *sha1, time_t mtime); extern int force_object_loose(const unsigned char *sha1, time_t mtime);
extern int git_open_cloexec(const char *name, int flags); extern int git_open_cloexec(const char *name, int flags);

8
sha1_file.c
View File

@ -3437,7 +3437,7 @@ int write_sha1_file(const void *buf, unsigned long len, const char *type, unsign
} }


int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type, int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type,
unsigned char *sha1, unsigned flags) struct object_id *oid, unsigned flags)
{ {
char *header; char *header;
int hdrlen, status = 0; int hdrlen, status = 0;
@ -3445,13 +3445,13 @@ int hash_sha1_file_literally(const void *buf, unsigned long len, const char *typ
/* type string, SP, %lu of the length plus NUL must fit this */ /* type string, SP, %lu of the length plus NUL must fit this */
hdrlen = strlen(type) + 32; hdrlen = strlen(type) + 32;
header = xmalloc(hdrlen); header = xmalloc(hdrlen);
write_sha1_file_prepare(buf, len, type, sha1, header, &hdrlen); write_sha1_file_prepare(buf, len, type, oid->hash, header, &hdrlen);


if (!(flags & HASH_WRITE_OBJECT)) if (!(flags & HASH_WRITE_OBJECT))
goto cleanup; goto cleanup;
if (freshen_packed_object(sha1) || freshen_loose_object(sha1)) if (freshen_packed_object(oid->hash) || freshen_loose_object(oid->hash))
goto cleanup; goto cleanup;
status = write_loose_object(sha1, header, hdrlen, buf, len, 0); status = write_loose_object(oid->hash, header, hdrlen, buf, len, 0);


cleanup: cleanup:
free(header); free(header);