object API: rename hash_object_file_literally() to write_*()

avar · gitster · commit 0ff7b4f976b7 · 2022-02-25T17:16:32.000-08:00
Before 0c3db67 (hash-object --literally: fix buffer overrun with extra-long object type, 2015-05-04) the hash-object code being changed here called write_sha1_file() to both hash and write a loose object. Before that we'd use hash_sha1_file() to if "-w" wasn't provided, and otherwise call write_sha1_file(). Now we'll always call the same function for both writing. Let's rename it from hash_*_literally() to write_*_literally(). Even though the write_*() might not actually write if HASH_WRITE_OBJECT isn't in "flags", having it be more similar to write_object_file_flags() than hash_object_file(), but carrying a name that would suggest that it's a variant of the latter is confusing. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/builtin/hash-object.c b/builtin/hash-object.c
@@ -25,7 +25,7 @@ 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_object_file_literally(buf.buf, buf.len, type, oid,
+		ret = write_object_file_literally(buf.buf, buf.len, type, oid,
 						 flags);
 	strbuf_release(&buf);
 	return ret;
diff --git a/object-file.c b/object-file.c
@@ -2027,9 +2027,9 @@ int write_object_file_flags(const void *buf, unsigned long len,
 	return write_loose_object(oid, hdr, hdrlen, buf, len, 0, flags);
 }
 
-int hash_object_file_literally(const void *buf, unsigned long len,
-			       const char *type, struct object_id *oid,
-			       unsigned flags)
+int write_object_file_literally(const void *buf, unsigned long len,
+				const char *type, struct object_id *oid,
+				unsigned flags)
 {
 	char *header;
 	int hdrlen, status = 0;
diff --git a/object-store.h b/object-store.h
@@ -258,9 +258,9 @@ static inline int write_object_file(const void *buf, unsigned long len,
 	return write_object_file_flags(buf, len, type, oid, 0);
 }
 
-int hash_object_file_literally(const void *buf, unsigned long len,
-			       const char *type, struct object_id *oid,
-			       unsigned flags);
+int write_object_file_literally(const void *buf, unsigned long len,
+				const char *type, struct object_id *oid,
+				unsigned flags);
 
 /*
  * Add an object file to the in-memory object store, without writing it

Original file line number	Diff line number	Diff line change
`@@ -2027,9 +2027,9 @@ int write_object_file_flags(const void *buf, unsigned long len,`
`2027`	`2027`	`return write_loose_object(oid, hdr, hdrlen, buf, len, 0, flags);`
`2028`	`2028`	`}`
`2029`	`2029`
`2030`		`-int hash_object_file_literally(const void *buf, unsigned long len,`
`2031`		`- const char type, struct object_id oid,`
`2032`		`- unsigned flags)`
	`2030`	`+int write_object_file_literally(const void *buf, unsigned long len,`
	`2031`	`+ const char type, struct object_id oid,`
	`2032`	`+ unsigned flags)`
`2033`	`2033`	`{`
`2034`	`2034`	`char *header;`
`2035`	`2035`	`int hdrlen, status = 0;`