Makes pprint_tag void and cleans up call in cmd_cat_file.
David
Signed-off-by: David Rientjes <rientjes@google.com>
---
builtin-cat-file.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
Show changes to builtin-cat-file.c +5 −4
diff --git a/builtin-cat-file.c b/builtin-cat-file.c
index 814fb07..df009ad 100644
--- a/builtin-cat-file.c
+++ b/builtin-cat-file.c
@@ -26,7 +26,7 @@ static void flush_buffer(const char *buf
}
}
-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 cha
*/
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 **
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;
--
1.4.2.g89bb-dirty