object: add repository argument to object_as_type

stefanbeller · gitster · commit 1268dfac1e98 · 2018-06-29T10:43:38.000-07:00
Signed-off-by: Stefan Beller &lt;sbeller@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/blob.c b/blob.c
@@ -11,7 +11,7 @@ struct blob *lookup_blob(const struct object_id *oid)
 	if (!obj)
 		return create_object(the_repository, oid->hash,
 				     alloc_blob_node(the_repository));
-	return object_as_type(obj, OBJ_BLOB, 0);
+	return object_as_type(the_repository, obj, OBJ_BLOB, 0);
 }
 
 int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size)
diff --git a/builtin/fsck.c b/builtin/fsck.c
@@ -70,7 +70,7 @@ static const char *printable_type(struct object *obj)
 		enum object_type type = oid_object_info(the_repository,
 							&obj->oid, NULL);
 		if (type > 0)
-			object_as_type(obj, type, 0);
+			object_as_type(the_repository, obj, type, 0);
 	}
 
 	ret = type_name(obj->type);
diff --git a/commit.c b/commit.c
@@ -32,7 +32,7 @@ struct commit *lookup_commit_reference_gently(const struct object_id *oid,
 
 	if (!obj)
 		return NULL;
-	return object_as_type(obj, OBJ_COMMIT, quiet);
+	return object_as_type(the_repository, obj, OBJ_COMMIT, quiet);
 }
 
 struct commit *lookup_commit_reference(const struct object_id *oid)
@@ -58,7 +58,7 @@ struct commit *lookup_commit(const struct object_id *oid)
 	if (!obj)
 		return create_object(the_repository, oid->hash,
 				     alloc_commit_node(the_repository));
-	return object_as_type(obj, OBJ_COMMIT, 0);
+	return object_as_type(the_repository, obj, OBJ_COMMIT, 0);
 }
 
 struct commit *lookup_commit_reference_by_name(const char *name)
diff --git a/object.c b/object.c
@@ -158,7 +158,7 @@ void *create_object(struct repository *r, const unsigned char *sha1, void *o)
 	return obj;
 }
 
-void *object_as_type(struct object *obj, enum object_type type, int quiet)
+void *object_as_type_the_repository(struct object *obj, enum object_type type, int quiet)
 {
 	if (obj->type == type)
 		return obj;
diff --git a/object.h b/object.h
@@ -114,7 +114,8 @@ struct object *lookup_object_the_repository(const unsigned char *sha1);
 
 extern void *create_object(struct repository *r, const unsigned char *sha1, void *obj);
 
-void *object_as_type(struct object *obj, enum object_type type, int quiet);
+#define object_as_type(r, o, t, q) object_as_type_##r(o, t, q)
+void *object_as_type_the_repository(struct object *obj, enum object_type type, int quiet);
 
 /*
  * Returns the object, having parsed it to find out what it is.
diff --git a/refs.c b/refs.c
@@ -305,7 +305,7 @@ enum peel_status peel_object(const struct object_id *name, struct object_id *oid
 
 	if (o->type == OBJ_NONE) {
 		int type = oid_object_info(the_repository, name, NULL);
-		if (type < 0 || !object_as_type(o, type, 0))
+		if (type < 0 || !object_as_type(the_repository, o, type, 0))
 			return PEEL_INVALID;
 	}
 
diff --git a/tag.c b/tag.c
@@ -98,7 +98,7 @@ struct tag *lookup_tag(const struct object_id *oid)
 	if (!obj)
 		return create_object(the_repository, oid->hash,
 				     alloc_tag_node(the_repository));
-	return object_as_type(obj, OBJ_TAG, 0);
+	return object_as_type(the_repository, obj, OBJ_TAG, 0);
 }
 
 static timestamp_t parse_tag_date(const char *buf, const char *tail)
diff --git a/tree.c b/tree.c
@@ -201,7 +201,7 @@ struct tree *lookup_tree(const struct object_id *oid)
 	if (!obj)
 		return create_object(the_repository, oid->hash,
 				     alloc_tree_node(the_repository));
-	return object_as_type(obj, OBJ_TREE, 0);
+	return object_as_type(the_repository, obj, OBJ_TREE, 0);
 }
 
 int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size)

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ struct blob lookup_blob(const struct object_id oid)`
`11`	`11`	`if (!obj)`
`12`	`12`	`return create_object(the_repository, oid->hash,`
`13`	`13`	`alloc_blob_node(the_repository));`
`14`		`- return object_as_type(obj, OBJ_BLOB, 0);`
	`14`	`+ return object_as_type(the_repository, obj, OBJ_BLOB, 0);`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`int parse_blob_buffer(struct blob item, void buffer, unsigned long size)`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ static const char printable_type(struct object obj)`
`70`	`70`	`enum object_type type = oid_object_info(the_repository,`
`71`	`71`	`&obj->oid, NULL);`
`72`	`72`	`if (type > 0)`
`73`		`- object_as_type(obj, type, 0);`
	`73`	`+ object_as_type(the_repository, obj, type, 0);`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`ret = type_name(obj->type);`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ struct commit lookup_commit_reference_gently(const struct object_id oid,`
`32`	`32`
`33`	`33`	`if (!obj)`
`34`	`34`	`return NULL;`
`35`		`- return object_as_type(obj, OBJ_COMMIT, quiet);`
	`35`	`+ return object_as_type(the_repository, obj, OBJ_COMMIT, quiet);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`struct commit lookup_commit_reference(const struct object_id oid)`
`@@ -58,7 +58,7 @@ struct commit lookup_commit(const struct object_id oid)`
`58`	`58`	`if (!obj)`
`59`	`59`	`return create_object(the_repository, oid->hash,`
`60`	`60`	`alloc_commit_node(the_repository));`
`61`		`- return object_as_type(obj, OBJ_COMMIT, 0);`
	`61`	`+ return object_as_type(the_repository, obj, OBJ_COMMIT, 0);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`struct commit lookup_commit_reference_by_name(const char name)`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ void create_object(struct repository r, const unsigned char sha1, void o)`
`158`	`158`	`return obj;`
`159`	`159`	`}`
`160`	`160`
`161`		`-void object_as_type(struct object obj, enum object_type type, int quiet)`
	`161`	`+void object_as_type_the_repository(struct object obj, enum object_type type, int quiet)`
`162`	`162`	`{`
`163`	`163`	`if (obj->type == type)`
`164`	`164`	`return obj;`
Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ enum peel_status peel_object(const struct object_id name, struct object_id oid`
`305`	`305`
`306`	`306`	`if (o->type == OBJ_NONE) {`
`307`	`307`	`int type = oid_object_info(the_repository, name, NULL);`
`308`		`- if (type < 0 \|\| !object_as_type(o, type, 0))`
	`308`	`+ if (type < 0 \|\| !object_as_type(the_repository, o, type, 0))`
`309`	`309`	`return PEEL_INVALID;`
`310`	`310`	`}`
`311`	`311`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ struct tag lookup_tag(const struct object_id oid)`
`98`	`98`	`if (!obj)`
`99`	`99`	`return create_object(the_repository, oid->hash,`
`100`	`100`	`alloc_tag_node(the_repository));`
`101`		`- return object_as_type(obj, OBJ_TAG, 0);`
	`101`	`+ return object_as_type(the_repository, obj, OBJ_TAG, 0);`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`static timestamp_t parse_tag_date(const char buf, const char tail)`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ struct tree lookup_tree(const struct object_id oid)`
`201`	`201`	`if (!obj)`
`202`	`202`	`return create_object(the_repository, oid->hash,`
`203`	`203`	`alloc_tree_node(the_repository));`
`204`		`- return object_as_type(obj, OBJ_TREE, 0);`
	`204`	`+ return object_as_type(the_repository, obj, OBJ_TREE, 0);`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`int parse_tree_buffer(struct tree item, void buffer, unsigned long size)`