sha1_file: rename hash_sha1_file_literally
This function was already converted to use struct object_id earlier. Signed-off-by: Patryk Obara <patryk.obara@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patryk Obara committed
Jan 28, 2018 at 01:13 UTC
1752cbbc447c08230c478239e185db9fa2d4a515
3 files changed
+8
-4
builtin/hash-object.c
+2
-1
@@ -24,7 +24,8 @@ static int hash_literally(struct object_id *oid, int fd, const char *type, unsig
24
if (strbuf_read(&buf, fd, 4096) < 0)
25
ret = -1;
26
else
27
- ret = hash_sha1_file_literally(buf.buf, buf.len, type, oid, flags);
27
+ ret = hash_object_file_literally(buf.buf, buf.len, type, oid,
28
+ flags);
29
strbuf_release(&buf);
30
return ret;
31
}
cache.h
+3
-1
@@ -1243,7 +1243,9 @@ extern int hash_object_file(const void *buf, unsigned long len,
1243
extern int write_object_file(const void *buf, unsigned long len,
1244
const char *type, struct object_id *oid);
1245
1246
-extern int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type, struct object_id *oid, unsigned flags);
1246
+extern int hash_object_file_literally(const void *buf, unsigned long len,
1247
+ const char *type, struct object_id *oid,
1248
+ unsigned flags);
1249
1250
extern int pretend_object_file(void *, unsigned long, enum object_type,
1251
struct object_id *oid);
sha1_file.c
+3
-2
@@ -1652,8 +1652,9 @@ int write_object_file(const void *buf, unsigned long len, const char *type,
1652
return write_loose_object(oid, hdr, hdrlen, buf, len, 0);
1653
}
1654
1655
-int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type,
1656
- struct object_id *oid, unsigned flags)
1655
+int hash_object_file_literally(const void *buf, unsigned long len,
1656
+ const char *type, struct object_id *oid,
1657
+ unsigned flags)
1658
{
1659
char *header;
1660
int hdrlen, status = 0;