aboutsummaryrefslogtreecommitdiff
path: root/builtin-grep.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2006-07-11 20:45:31 -0700
committerJunio C Hamano <junkio@cox.net>2006-07-12 23:18:03 -0700
commit1974632c664c2d573b36a00fa993c1c13dd8a967 (patch)
tree435ba8ee055c206c984240fc28a20ef15bc47e4d /builtin-grep.c
parentd3ba675aae3c6c5722ad15cd9d0f3b7634e976ce (diff)
downloadgit-1974632c664c2d573b36a00fa993c1c13dd8a967.tar.gz
git-1974632c664c2d573b36a00fa993c1c13dd8a967.tar.xz
Remove TYPE_* constant macros and use object_type enums consistently.
This updates the type-enumeration constants introduced to reduce the memory footprint of "struct object" to match the type bits already used in the packfile format, by removing the former (i.e. TYPE_* constant macros) and using the latter (i.e. enum object_type) throughout the code for consistency. Eventually we can stop passing around the "type strings" entirely, and this will help - no confusion about two different integer enumeration. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-grep.c')
-rw-r--r--builtin-grep.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-grep.c b/builtin-grep.c
index 4c2f7dfe0..a79bac305 100644
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -891,9 +891,9 @@ static int grep_tree(struct grep_opt *opt, const char **paths,
static int grep_object(struct grep_opt *opt, const char **paths,
struct object *obj, const char *name)
{
- if (obj->type == TYPE_BLOB)
+ if (obj->type == OBJ_BLOB)
return grep_sha1(opt, obj->sha1, name);
- if (obj->type == TYPE_COMMIT || obj->type == TYPE_TREE) {
+ if (obj->type == OBJ_COMMIT || obj->type == OBJ_TREE) {
struct tree_desc tree;
void *data;
int hit;