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>maint
parent
a976b0a593
commit
eddd1c8cef
|
@ -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. */
|
/* the parser in tag.c is useless here. */
|
||||||
const char *endp = buf + size;
|
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)
|
if (cp < endp)
|
||||||
flush_buffer(cp, endp - cp);
|
flush_buffer(cp, endp - cp);
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int cmd_cat_file(int argc, const char **argv, const char *prefix)
|
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);
|
buf = read_sha1_file(sha1, type, &size);
|
||||||
if (!buf)
|
if (!buf)
|
||||||
die("Cannot read object %s", argv[2]);
|
die("Cannot read object %s", argv[2]);
|
||||||
if (!strcmp(type, tag_type))
|
if (!strcmp(type, tag_type)) {
|
||||||
return pprint_tag(sha1, buf, size);
|
pprint_tag(sha1, buf, size);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
/* otherwise just spit out the data */
|
/* otherwise just spit out the data */
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue