fsck: convert init_skiplist to struct object_id

Convert a hardcoded constant buffer size to a use of GIT_MAX_HEXSZ, and
use parse_oid_hex to reduce the dependency on the size of the hash.
This function is a caller of sha1_array_append, which will be converted
later.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/fsck.c b/fsck.c
index 939792752bf39c72cc536f00c21e2af8ed854c3e..aff4ae6fd4c6aacd1462bd57d087e8720d5781f1 100644 (file)
--- a/fsck.c
+++ b/fsck.c
@@ -134,8 +134,8 @@ static void init_skiplist(struct fsck_options *options, const char *path)
 {
        static struct sha1_array skiplist = SHA1_ARRAY_INIT;
        int sorted, fd;
 {
        static struct sha1_array skiplist = SHA1_ARRAY_INIT;
        int sorted, fd;

-       char buffer[41];
-       unsigned char sha1[20];
+       char buffer[GIT_MAX_HEXSZ + 1];
+       struct object_id oid;

 
        if (options->skiplist)
                sorted = options->skiplist->sorted;
 
        if (options->skiplist)
                sorted = options->skiplist->sorted;


@@ -148,17 +148,18 @@ static void init_skiplist(struct fsck_options *options, const char *path)
        if (fd < 0)
                die("Could not open skip list: %s", path);
        for (;;) {
        if (fd < 0)
                die("Could not open skip list: %s", path);
        for (;;) {

+               const char *p;

                int result = read_in_full(fd, buffer, sizeof(buffer));
                if (result < 0)
                        die_errno("Could not read '%s'", path);
                if (!result)
                        break;
                int result = read_in_full(fd, buffer, sizeof(buffer));
                if (result < 0)
                        die_errno("Could not read '%s'", path);
                if (!result)
                        break;

-               if (get_sha1_hex(buffer, sha1) || buffer[40] != '\n')
+               if (parse_oid_hex(buffer, &oid, &p) || *p != '\n')

                        die("Invalid SHA-1: %s", buffer);
                        die("Invalid SHA-1: %s", buffer);

-               sha1_array_append(&skiplist, sha1);
+               sha1_array_append(&skiplist, oid.hash);

                if (sorted && skiplist.nr > 1 &&
                                hashcmp(skiplist.sha1[skiplist.nr - 2],
                if (sorted && skiplist.nr > 1 &&
                                hashcmp(skiplist.sha1[skiplist.nr - 2],

-                                       sha1) > 0)
+                                       oid.hash) > 0)

                        sorted = 0;
        }
        close(fd);
                        sorted = 0;
        }
        close(fd);