diff options
| author | Linus Torvalds <torvalds@osdl.org> | 2006-07-12 03:45:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-13 06:18:03 (GMT) |
| commit | 1974632c664c2d573b36a00fa993c1c13dd8a967 (patch) | |
| tree | 435ba8ee055c206c984240fc28a20ef15bc47e4d /http-push.c | |
| parent | d3ba675aae3c6c5722ad15cd9d0f3b7634e976ce (diff) | |
| download | git-1974632c664c2d573b36a00fa993c1c13dd8a967.zip git-1974632c664c2d573b36a00fa993c1c13dd8a967.tar.gz git-1974632c664c2d573b36a00fa993c1c13dd8a967.tar.bz2 | |
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 'http-push.c')
| -rw-r--r-- | http-push.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/http-push.c b/http-push.c index f761584..4768619 100644 --- a/http-push.c +++ b/http-push.c @@ -1784,16 +1784,16 @@ static int get_delta(struct rev_info *revs, struct remote_lock *lock) if (obj->flags & (UNINTERESTING | SEEN)) continue; - if (obj->type == TYPE_TAG) { + if (obj->type == OBJ_TAG) { obj->flags |= SEEN; p = add_one_object(obj, p); continue; } - if (obj->type == TYPE_TREE) { + if (obj->type == OBJ_TREE) { p = process_tree((struct tree *)obj, p, NULL, name); continue; } - if (obj->type == TYPE_BLOB) { + if (obj->type == OBJ_BLOB) { p = process_blob((struct blob *)obj, p, NULL, name); continue; } @@ -1960,12 +1960,12 @@ static int ref_newer(const unsigned char *new_sha1, * old. Otherwise we require --force. */ o = deref_tag(parse_object(old_sha1), NULL, 0); - if (!o || o->type != TYPE_COMMIT) + if (!o || o->type != OBJ_COMMIT) return 0; old = (struct commit *) o; o = deref_tag(parse_object(new_sha1), NULL, 0); - if (!o || o->type != TYPE_COMMIT) + if (!o || o->type != OBJ_COMMIT) return 0; new = (struct commit *) o; @@ -2044,7 +2044,7 @@ static void add_remote_info_ref(struct remote_ls_ctx *ls) fwrite_buffer(ref_info, 1, len, buf); free(ref_info); - if (o->type == TYPE_TAG) { + if (o->type == OBJ_TAG) { o = deref_tag(o, ls->dentry_name, 0); if (o) { len = strlen(ls->dentry_name) + 45; |