[PATCH] Enhance sha1_file_size() into sha1_object_info()

[thirdparty/git.git] / sha1_file.c

diff --git a/sha1_file.c b/sha1_file.c
index a12da4e238cad6981507a96576bcf5cfad359f6b..4225c67c5b3f76ec8c20a4878e519a82a8b1ccae 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -409,20 +409,22 @@ void * unpack_sha1_file(void *map, unsigned long mapsize, char *type, unsigned l
        return unpack_sha1_rest(&stream, hdr, *size);
 }
 
-int sha1_file_size(const unsigned char *sha1, unsigned long *sizep)
+int sha1_object_info(const unsigned char *sha1, char *type, unsigned long *sizep)
 {
-       int ret, status;
+       int status;
        unsigned long mapsize, size;
        void *map;
        z_stream stream;
-       char hdr[64], type[20];
+       char hdr[128];
 
        map = map_sha1_file(sha1, &mapsize);
        if (!map)
-               return -1;
-       ret = unpack_sha1_header(&stream, map, mapsize, hdr, sizeof(hdr));
-       if (ret < Z_OK || parse_sha1_header(hdr, type, &size) < 0)
-               status = -1;
+               return error("unable to map %s", sha1_to_hex(sha1));
+       if (unpack_sha1_header(&stream, map, mapsize, hdr, sizeof(hdr)) < 0)
+               status = error("unable to unpack %s header",
+                              sha1_to_hex(sha1));
+       if (parse_sha1_header(hdr, type, &size) < 0)
+               status = error("unable to parse %s header", sha1_to_hex(sha1));
        else {
                status = 0;
                *sizep = size;