summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar David Rientjes <rientjes@google.com>2006-08-14 13:19:15 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-08-14 18:43:49 -0700
commiteddd1c8cefa596abbb81ac5a0af21ba104033b3d (patch)
tree49158d769f65357b15da67f4448c18e9bc3672cf
parentRemove combine-diff.c::uninteresting() (diff)
downloadtgif-eddd1c8cefa596abbb81ac5a0af21ba104033b3d.tar.xz
Make pprint_tag void and cleans up call in cmd_cat_file.
Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--builtin-cat-file.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/builtin-cat-file.c b/builtin-cat-file.c
index 814fb0743f..df009ade7a 100644
--- a/builtin-cat-file.c
+++ b/builtin-cat-file.c
@@ -26,7 +26,7 @@ static void flush_buffer(const char *buf, unsigned long size)
}
}
-static int pprint_tag(const unsigned char *sha1, const char *buf, unsigned long size)
+static void pprint_tag(const unsigned char *sha1, const char *buf, unsigned long size)
{
/* the parser in tag.c is useless here. */
const char *endp = buf + size;
@@ -91,7 +91,6 @@ static int pprint_tag(const unsigned char *sha1, const char *buf, unsigned long
*/
if (cp < endp)
flush_buffer(cp, endp - cp);
- return 0;
}
int cmd_cat_file(int argc, const char **argv, const char *prefix)
@@ -145,8 +144,10 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
buf = read_sha1_file(sha1, type, &size);
if (!buf)
die("Cannot read object %s", argv[2]);
- if (!strcmp(type, tag_type))
- return pprint_tag(sha1, buf, size);
+ if (!strcmp(type, tag_type)) {
+ pprint_tag(sha1, buf, size);
+ return 0;
+ }
/* otherwise just spit out the data */
break;