Signed-off-by: Stefan Beller <sbel...@google.com>
---
object.c | 18 +++++++++---------
object.h | 3 +--
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/object.c b/object.c
index 7a7b078e4d0..b63a51febd4 100644
--- a/object.c
+++ b/object.c
@@ -185,21 +185,21 @@ struct object *lookup_unknown_object(const unsigned char
*sha1)
return obj;
}
-struct object *parse_object_buffer_the_repository(const struct object_id *oid,
enum object_type type, unsigned long size, void *buffer, int *eaten_p)
+struct object *parse_object_buffer(struct repository *r, const struct
object_id *oid, enum object_type type, unsigned long size, void *buffer, int
*eaten_p)
{
struct object *obj;
*eaten_p = 0;
obj = NULL;
if (type == OBJ_BLOB) {
- struct blob *blob = lookup_blob(the_repository, oid);
+ struct blob *blob = lookup_blob(r, oid);
if (blob) {
if (parse_blob_buffer(blob, buffer, size))
return NULL;
obj = &blob->object;
}
} else if (type == OBJ_TREE) {
- struct tree *tree = lookup_tree(the_repository, oid);
+ struct tree *tree = lookup_tree(r, oid);
if (tree) {
obj = &tree->object;
if (!tree->buffer)
@@ -211,20 +211,20 @@ struct object *parse_object_buffer_the_repository(const
struct object_id *oid, e
}
}
} else if (type == OBJ_COMMIT) {
- struct commit *commit = lookup_commit(the_repository, oid);
+ struct commit *commit = lookup_commit(r, oid);
if (commit) {
- if (parse_commit_buffer(the_repository, commit, buffer,
size))
+ if (parse_commit_buffer(r, commit, buffer, size))
return NULL;
- if (!get_cached_commit_buffer(the_repository, commit,
NULL)) {
- set_commit_buffer(the_repository, commit,
buffer, size);
+ if (!get_cached_commit_buffer(r, commit, NULL)) {
+ set_commit_buffer(r, commit, buffer, size);
*eaten_p = 1;
}
obj = &commit->object;
}
} else if (type == OBJ_TAG) {
- struct tag *tag = lookup_tag(the_repository, oid);
+ struct tag *tag = lookup_tag(r, oid);
if (tag) {
- if (parse_tag_buffer(the_repository, tag, buffer, size))
+ if (parse_tag_buffer(r, tag, buffer, size))
return NULL;
obj = &tag->object;
}
diff --git a/object.h b/object.h
index 876480c933c..9a667fbe795 100644
--- a/object.h
+++ b/object.h
@@ -139,8 +139,7 @@ struct object *parse_object_or_die(const struct object_id
*oid, const char *name
* parsing it. eaten_p indicates if the object has a borrowed copy
* of buffer and the caller should not free() it.
*/
-#define parse_object_buffer(r, o, t, s, b, e) parse_object_buffer_##r(o, t, s,
b, e)
-struct object *parse_object_buffer_the_repository(const struct object_id *oid,
enum object_type type, unsigned long size, void *buffer, int *eaten_p);
+struct object *parse_object_buffer(struct repository *r, const struct
object_id *oid, enum object_type type, unsigned long size, void *buffer, int
*eaten_p);
/** Returns the object, with potentially excess memory allocated. **/
struct object *lookup_unknown_object(const unsigned char *sha1);
--
2.18.0.rc1.244.gcf134e6275-goog
