Convert lookup_blob to struct object_id

Convert lookup_blob to take a pointer to struct object_id.

The commit was created with manual changes to blob.c and blob.h, plus
the following semantic patch:

@@
expression E1;
@@
- lookup_blob(E1.hash)
+ lookup_blob(&E1)

@@
expression E1;
@@
- lookup_blob(E1->hash)
+ lookup_blob(E1)

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

diff --git a/blob.c b/blob.c
index 1fcb8e44b00f3b9eedbe92da8abe47c2bebca7c7..fa2ab4f7a74e501366e1d3ceca9285ae60606165 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -3,11 +3,11 @@
 
 const char *blob_type = "blob";
 
 
 const char *blob_type = "blob";
 

-struct blob *lookup_blob(const unsigned char *sha1)
+struct blob *lookup_blob(const struct object_id *oid)

 {
 {

-       struct object *obj = lookup_object(sha1);
+       struct object *obj = lookup_object(oid->hash);

        if (!obj)
        if (!obj)

-               return create_object(sha1, alloc_blob_node());
+               return create_object(oid->hash, alloc_blob_node());

        return object_as_type(obj, OBJ_BLOB, 0);
 }
 
        return object_as_type(obj, OBJ_BLOB, 0);
 }
 

diff --git a/blob.h b/blob.h
index 59b394eea38494d5dfa525e28ca949e5a03efcf5..446061683101d5578f8de2b8aa43e4b6c51d1d66 100644 (file)
--- a/blob.h
+++ b/blob.h
@@ -9,7 +9,7 @@ struct blob {
        struct object object;
 };
 
        struct object object;
 };
 

-struct blob *lookup_blob(const unsigned char *sha1);
+struct blob *lookup_blob(const struct object_id *oid);

 
 int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size);
 
 
 int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size);
 

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index b4521cb6274422ca79ada685c845a6b330a07024..ae36b14db70d5ae02982bc0ad6fb814e6f061b5f 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -232,7 +232,7 @@ static void export_blob(const struct object_id *oid)
 
        if (anonymize) {
                buf = anonymize_blob(&size);
 
        if (anonymize) {
                buf = anonymize_blob(&size);

-               object = (struct object *)lookup_blob(oid->hash);
+               object = (struct object *)lookup_blob(oid);

                eaten = 0;
        } else {
                buf = read_sha1_file(oid->hash, &type, &size);
                eaten = 0;
        } else {
                buf = read_sha1_file(oid->hash, &type, &size);

diff --git a/builtin/fsck.c b/builtin/fsck.c
index c40e14de658e399833a69225a04e93cd4ff27cc7..2f67e8217ec9588fe8ca5ab1fa6db41b907a8bed 100644 (file)
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -781,7 +781,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
                        mode = active_cache[i]->ce_mode;
                        if (S_ISGITLINK(mode))
                                continue;
                        mode = active_cache[i]->ce_mode;
                        if (S_ISGITLINK(mode))
                                continue;

-                       blob = lookup_blob(active_cache[i]->oid.hash);
+                       blob = lookup_blob(&active_cache[i]->oid);

                        if (!blob)
                                continue;
                        obj = &blob->object;
                        if (!blob)
                                continue;
                        obj = &blob->object;

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 2241ee68ed0805942e98ef59bbd85c64651603ec..b75133f625c79b5452f93076161f89e62d8ad906 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -829,7 +829,7 @@ static void sha1_object(const void *data, struct object_entry *obj_entry,
        if (strict) {
                read_lock();
                if (type == OBJ_BLOB) {
        if (strict) {
                read_lock();
                if (type == OBJ_BLOB) {

-                       struct blob *blob = lookup_blob(oid->hash);
+                       struct blob *blob = lookup_blob(oid);

                        if (blob)
                                blob->object.flags |= FLAG_CHECKED;
                        else
                        if (blob)
                                blob->object.flags |= FLAG_CHECKED;
                        else

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index cdeb6562da43b039eca1dd822c43f8e780d34e01..bad6735c76fd0647547edfd1201d91c3c86dfc8f 100644 (file)
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -168,7 +168,7 @@ static struct merge_list *create_entry(unsigned stage, unsigned mode, const stru
        res->stage = stage;
        res->path = path;
        res->mode = mode;
        res->stage = stage;
        res->path = path;
        res->mode = mode;

-       res->blob = lookup_blob(oid->hash);
+       res->blob = lookup_blob(oid);

        return res;
 }
 
        return res;
 }
 

diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 3dc5e569186636fbb4bb9508f5915b8ab951ca32..7d5efa2b3b5a7b83c7765765e360757d6f7d282a 100644 (file)
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -249,7 +249,7 @@ static void write_object(unsigned nr, enum object_type type,
                added_object(nr, type, buf, size);
                free(buf);
 
                added_object(nr, type, buf, size);
                free(buf);
 

-               blob = lookup_blob(obj_list[nr].oid.hash);
+               blob = lookup_blob(&obj_list[nr].oid);

                if (blob)
                        blob->object.flags |= FLAG_WRITTEN;
                else
                if (blob)
                        blob->object.flags |= FLAG_WRITTEN;
                else

diff --git a/fsck.c b/fsck.c
index e6152e4e6d426bd92ae7ae063346f25f85ddd8de..ab3016c0e1f96f00a17a5b8dfe1fec1956ac5ff3 100644 (file)
--- a/fsck.c
+++ b/fsck.c
@@ -365,7 +365,7 @@ static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *op
                        result = options->walk(obj, OBJ_TREE, data, options);
                }
                else if (S_ISREG(entry.mode) || S_ISLNK(entry.mode)) {
                        result = options->walk(obj, OBJ_TREE, data, options);
                }
                else if (S_ISREG(entry.mode) || S_ISLNK(entry.mode)) {

-                       obj = &lookup_blob(entry.oid->hash)->object;
+                       obj = &lookup_blob(entry.oid)->object;

                        if (name)
                                put_object_name(options, obj, "%s%s", name,
                                        entry.path);
                        if (name)
                                put_object_name(options, obj, "%s%s", name,
                                        entry.path);

diff --git a/http-push.c b/http-push.c
index 04568e4fbd4e6f8d7bca074331d19977f9c9dc28..9bb5e06482b2dd59411d9f70b49cc4ab72a49c6f 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -1315,7 +1315,7 @@ static struct object_list **process_tree(struct tree *tree,
                        p = process_tree(lookup_tree(entry.oid->hash), p);
                        break;
                case OBJ_BLOB:
                        p = process_tree(lookup_tree(entry.oid->hash), p);
                        break;
                case OBJ_BLOB:

-                       p = process_blob(lookup_blob(entry.oid->hash), p);
+                       p = process_blob(lookup_blob(entry.oid), p);

                        break;
                default:
                        /* Subproject commit - not in this repository */
                        break;
                default:
                        /* Subproject commit - not in this repository */

diff --git a/list-objects.c b/list-objects.c
index f3ca6aafb799eadc6255d61711d0aba8cb516463..721e5fb08b7f9695aeaac33649d3e5d98ddb676d 100644 (file)
--- a/list-objects.c
+++ b/list-objects.c
@@ -119,7 +119,7 @@ static void process_tree(struct rev_info *revs,
                                        cb_data);
                else
                        process_blob(revs,
                                        cb_data);
                else
                        process_blob(revs,

-                                    lookup_blob(entry.oid->hash),
+                                    lookup_blob(entry.oid),

                                     show, base, entry.path,
                                     cb_data);
        }
                                     show, base, entry.path,
                                     cb_data);
        }

diff --git a/object.c b/object.c
index 0208c407a6e829f4ad76d347d559470c0ee08475..2c8d1e5d314702a532e799d254093d948b4ff421 100644 (file)
--- a/object.c
+++ b/object.c
@@ -190,7 +190,7 @@ struct object *parse_object_buffer(const unsigned char *sha1, enum object_type t
 
        obj = NULL;
        if (type == OBJ_BLOB) {
 
        obj = NULL;
        if (type == OBJ_BLOB) {

-               struct blob *blob = lookup_blob(oid.hash);
+               struct blob *blob = lookup_blob(&oid);

                if (blob) {
                        if (parse_blob_buffer(blob, buffer, size))
                                return NULL;
                if (blob) {
                        if (parse_blob_buffer(blob, buffer, size))
                                return NULL;


@@ -266,7 +266,7 @@ struct object *parse_object(const unsigned char *sha1)
                        error("sha1 mismatch %s", sha1_to_hex(repl));
                        return NULL;
                }
                        error("sha1 mismatch %s", sha1_to_hex(repl));
                        return NULL;
                }

-               parse_blob_buffer(lookup_blob(oid.hash), NULL, 0);
+               parse_blob_buffer(lookup_blob(&oid), NULL, 0);

                return lookup_object(sha1);
        }
 
                return lookup_object(sha1);
        }
 

diff --git a/reachable.c b/reachable.c
index a8a979bd4fcbac6732d26dda3f826a1eec3d3a6b..8ea0bdd7c045002df53ad9098f88b8e55b3136c9 100644 (file)
--- a/reachable.c
+++ b/reachable.c
@@ -88,7 +88,7 @@ static void add_recent_object(const struct object_id *oid,
                obj = (struct object *)lookup_tree(oid->hash);
                break;
        case OBJ_BLOB:
                obj = (struct object *)lookup_tree(oid->hash);
                break;
        case OBJ_BLOB:

-               obj = (struct object *)lookup_blob(oid->hash);
+               obj = (struct object *)lookup_blob(oid);

                break;
        default:
                die("unknown object type for %s: %s",
                break;
        default:
                die("unknown object type for %s: %s",

diff --git a/revision.c b/revision.c
index f8e0dee6d566af78eafab1b1044b2087d56f6732..db2de7a7a8d4a9dfcb72cc102866e6f41b06836c 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -62,7 +62,7 @@ static void mark_tree_contents_uninteresting(struct tree *tree)
                        mark_tree_uninteresting(lookup_tree(entry.oid->hash));
                        break;
                case OBJ_BLOB:
                        mark_tree_uninteresting(lookup_tree(entry.oid->hash));
                        break;
                case OBJ_BLOB:

-                       mark_blob_uninteresting(lookup_blob(entry.oid->hash));
+                       mark_blob_uninteresting(lookup_blob(entry.oid));

                        break;
                default:
                        /* Subproject commit - not in this repository */
                        break;
                default:
                        /* Subproject commit - not in this repository */


@@ -1275,7 +1275,7 @@ void add_index_objects_to_pending(struct rev_info *revs, unsigned flags)
                if (S_ISGITLINK(ce->ce_mode))
                        continue;
 
                if (S_ISGITLINK(ce->ce_mode))
                        continue;
 

-               blob = lookup_blob(ce->oid.hash);
+               blob = lookup_blob(&ce->oid);

                if (!blob)
                        die("unable to add index blob to traversal");
                add_pending_object_with_path(revs, &blob->object, "",
                if (!blob)
                        die("unable to add index blob to traversal");
                add_pending_object_with_path(revs, &blob->object, "",

diff --git a/tag.c b/tag.c
index 79b78d358331a3ca4a340f978bf85d3e7249c00b..dff251673ec2b3723262a0c5676c482529c29f62 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -142,7 +142,7 @@ int parse_tag_buffer(struct tag *item, const void *data, unsigned long size)
        bufptr = nl + 1;
 
        if (!strcmp(type, blob_type)) {
        bufptr = nl + 1;
 
        if (!strcmp(type, blob_type)) {

-               item->tagged = &lookup_blob(oid.hash)->object;
+               item->tagged = &lookup_blob(&oid)->object;

        } else if (!strcmp(type, tree_type)) {
                item->tagged = &lookup_tree(oid.hash)->object;
        } else if (!strcmp(type, commit_type)) {
        } else if (!strcmp(type, tree_type)) {
                item->tagged = &lookup_tree(oid.hash)->object;
        } else if (!strcmp(type, commit_type)) {

diff --git a/walker.c b/walker.c
index b499fcb7290ec690d61cd7601f9675100ce50312..3d6029c8e226c1de37b38a379fe47d82976bd758 100644 (file)
--- a/walker.c
+++ b/walker.c
@@ -52,7 +52,7 @@ static int process_tree(struct walker *walker, struct tree *tree)
                                obj = &tree->object;
                }
                else {
                                obj = &tree->object;
                }
                else {

-                       struct blob *blob = lookup_blob(entry.oid->hash);
+                       struct blob *blob = lookup_blob(entry.oid);

                        if (blob)
                                obj = &blob->object;
                }
                        if (blob)
                                obj = &blob->object;
                }