sha1_file: rename hash_sha1_file_literally

dreamer · gitster · commit 1752cbbc447c · 2018-01-30T10:42:36.000-08:00
This function was already converted to use struct object_id earlier.

Signed-off-by: Patryk Obara &lt;patryk.obara@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/hash-object.c b/builtin/hash-object.c
@@ -24,7 +24,8 @@ static int hash_literally(struct object_id *oid, int fd, const char *type, unsig
 	if (strbuf_read(&buf, fd, 4096) < 0)
 		ret = -1;
 	else
-		ret = hash_sha1_file_literally(buf.buf, buf.len, type, oid, flags);
+		ret = hash_object_file_literally(buf.buf, buf.len, type, oid,
+						 flags);
 	strbuf_release(&buf);
 	return ret;
 }
diff --git a/cache.h b/cache.h
@@ -1243,7 +1243,9 @@ extern int hash_object_file(const void *buf, unsigned long len,
 extern int write_object_file(const void *buf, unsigned long len,
 			     const char *type, struct object_id *oid);
 
-extern int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type, struct object_id *oid, unsigned flags);
+extern int hash_object_file_literally(const void *buf, unsigned long len,
+				      const char *type, struct object_id *oid,
+				      unsigned flags);
 
 extern int pretend_object_file(void *, unsigned long, enum object_type,
 			       struct object_id *oid);
diff --git a/sha1_file.c b/sha1_file.c
@@ -1652,8 +1652,9 @@ int write_object_file(const void *buf, unsigned long len, const char *type,
 	return write_loose_object(oid, hdr, hdrlen, buf, len, 0);
 }
 
-int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type,
-			     struct object_id *oid, unsigned flags)
+int hash_object_file_literally(const void *buf, unsigned long len,
+			       const char *type, struct object_id *oid,
+			       unsigned flags)
 {
 	char *header;
 	int hdrlen, status = 0;

Original file line number	Diff line number	Diff line change
`@@ -1652,8 +1652,9 @@ int write_object_file(const void buf, unsigned long len, const char type,`
`1652`	`1652`	`return write_loose_object(oid, hdr, hdrlen, buf, len, 0);`
`1653`	`1653`	`}`
`1654`	`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)`
`1657`	`1658`	`{`
`1658`	`1659`	`char *header;`
`1659`	`1660`	`int hdrlen, status = 0;`