X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=unpack-file.c;h=65c66eb0bf34efee6485db3dbf8af11788c394f4;hb=d1b28f512c6d2c7d373c746d8876dbf177ddf114;hp=d24acc2a67c4b7ba112bd192680b137f30a06003;hpb=b4d2b04c9b6dc42c0bcf0513b9d8f731ec26db82;p=git.git

diff --git a/unpack-file.c b/unpack-file.c
index d24acc2a6..65c66eb0b 100644
--- a/unpack-file.c
+++ b/unpack-file.c
@@ -5,18 +5,16 @@ static char *create_temp_file(unsigned char *sha1)
 {
 	static char path[50];
 	void *buf;
-	char type[100];
+	enum object_type type;
 	unsigned long size;
 	int fd;
 
-	buf = read_sha1_file(sha1, type, &size);
-	if (!buf || strcmp(type, blob_type))
+	buf = read_sha1_file(sha1, &type, &size);
+	if (!buf || type != OBJ_BLOB)
 		die("unable to read blob object %s", sha1_to_hex(sha1));
 
 	strcpy(path, ".merge_file_XXXXXX");
-	fd = mkstemp(path);
-	if (fd < 0)
-		die("unable to create temp-file");
+	fd = xmkstemp(path);
 	if (write_in_full(fd, buf, size) != size)
 		die("unable to write temp-file");
 	close(fd);