Add callback data to for_each_ref() family.

diff --git a/sha1_file.c b/sha1_file.c
index 4ef98053f8b5ba9988fd28afc60a1ae2fced93c9..b89edb9515aa38c2c404367aa28ec5531fcc7de1 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -26,15 +26,43 @@ const unsigned char null_sha1[20];
 
 static unsigned int sha1_file_open_flag = O_NOATIME;
 
-static unsigned hexval(char c)
-{
-       if (c >= '0' && c <= '9')
-               return c - '0';
-       if (c >= 'a' && c <= 'f')
-               return c - 'a' + 10;
-       if (c >= 'A' && c <= 'F')
-               return c - 'A' + 10;
-       return ~0;
+static inline unsigned int hexval(unsigned int c)
+{
+       static signed char val[256] = {
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* 00-07 */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* 08-0f */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* 10-17 */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* 18-1f */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* 20-27 */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* 28-2f */
+                 0,  1,  2,  3,  4,  5,  6,  7,                /* 30-37 */
+                 8,  9, -1, -1, -1, -1, -1, -1,                /* 38-3f */
+                -1, 10, 11, 12, 13, 14, 15, -1,                /* 40-47 */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* 48-4f */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* 50-57 */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* 58-5f */
+                -1, 10, 11, 12, 13, 14, 15, -1,                /* 60-67 */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* 68-67 */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* 70-77 */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* 78-7f */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* 80-87 */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* 88-8f */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* 90-97 */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* 98-9f */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* a0-a7 */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* a8-af */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* b0-b7 */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* b8-bf */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* c0-c7 */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* c8-cf */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* d0-d7 */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* d8-df */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* e0-e7 */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* e8-ef */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* f0-f7 */
+                -1, -1, -1, -1, -1, -1, -1, -1,                /* f8-ff */
+       };
+       return val[c];
 }
 
 int get_sha1_hex(const char *hex, unsigned char *sha1)
@@ -711,7 +739,7 @@ int legacy_loose_object(unsigned char *map)
                return 0;
 }
 
-static unsigned long unpack_object_header_gently(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep)
+unsigned long unpack_object_header_gently(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep)
 {
        unsigned shift;
        unsigned char c;
@@ -1189,12 +1217,20 @@ int find_pack_entry_one(const unsigned char *sha1,
        return 0;
 }
 
-static int find_pack_entry(const unsigned char *sha1, struct pack_entry *e)
+static int find_pack_entry(const unsigned char *sha1, struct pack_entry *e, const char **ignore_packed)
 {
        struct packed_git *p;
        prepare_packed_git();
 
        for (p = packed_git; p; p = p->next) {
+               if (ignore_packed) {
+                       const char **ig;
+                       for (ig = ignore_packed; *ig; ig++)
+                               if (!strcmp(p->pack_name, *ig))
+                                       break;
+                       if (*ig)
+                               continue;
+               }
                if (find_pack_entry_one(sha1, e, p))
                        return 1;
        }
@@ -1227,10 +1263,10 @@ int sha1_object_info(const unsigned char *sha1, char *type, unsigned long *sizep
        if (!map) {
                struct pack_entry e;
 
-               if (find_pack_entry(sha1, &e))
+               if (find_pack_entry(sha1, &e, NULL))
                        return packed_object_info(&e, type, sizep);
                reprepare_packed_git();
-               if (find_pack_entry(sha1, &e))
+               if (find_pack_entry(sha1, &e, NULL))
                        return packed_object_info(&e, type, sizep);
                return error("unable to find %s", sha1_to_hex(sha1));
        }
@@ -1253,7 +1289,7 @@ static void *read_packed_sha1(const unsigned char *sha1, char *type, unsigned lo
 {
        struct pack_entry e;
 
-       if (!find_pack_entry(sha1, &e)) {
+       if (!find_pack_entry(sha1, &e, NULL)) {
                error("cannot read sha1_file for %s", sha1_to_hex(sha1));
                return NULL;
        }
@@ -1266,7 +1302,7 @@ void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size
        void *map, *buf;
        struct pack_entry e;
 
-       if (find_pack_entry(sha1, &e))
+       if (find_pack_entry(sha1, &e, NULL))
                return read_packed_sha1(sha1, type, size);
        map = map_sha1_file(sha1, &mapsize);
        if (map) {
@@ -1275,7 +1311,7 @@ void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size
                return buf;
        }
        reprepare_packed_git();
-       if (find_pack_entry(sha1, &e))
+       if (find_pack_entry(sha1, &e, NULL))
                return read_packed_sha1(sha1, type, size);
        return NULL;
 }
@@ -1707,10 +1743,10 @@ int has_pack_file(const unsigned char *sha1)
        return 1;
 }
 
-int has_sha1_pack(const unsigned char *sha1)
+int has_sha1_pack(const unsigned char *sha1, const char **ignore_packed)
 {
        struct pack_entry e;
-       return find_pack_entry(sha1, &e);
+       return find_pack_entry(sha1, &e, ignore_packed);
 }
 
 int has_sha1_file(const unsigned char *sha1)
@@ -1718,7 +1754,7 @@ int has_sha1_file(const unsigned char *sha1)
        struct stat st;
        struct pack_entry e;
 
-       if (find_pack_entry(sha1, &e))
+       if (find_pack_entry(sha1, &e, NULL))
                return 1;
        return find_sha1_file(sha1, &st) ? 1 : 0;
 }