From: Michael Haggerty Date: Thu, 15 Sep 2011 21:10:29 +0000 (+0200) Subject: Inline function refname_format_print() X-Git-Tag: v1.7.8-rc0~19^2~17 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a5e4ec063afea050d09773f0aa5dcb95a82a31ec;p=git.git Inline function refname_format_print() Soon we will make printing independent of collapsing. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c index 989ee5cc0..f5df9aad7 100644 --- a/builtin/check-ref-format.c +++ b/builtin/check-ref-format.c @@ -48,17 +48,12 @@ static int check_ref_format_branch(const char *arg) return 0; } -static void refname_format_print(const char *arg) -{ - char *refname = collapse_slashes(arg); - printf("%s\n", refname); -} - int cmd_check_ref_format(int argc, const char **argv, const char *prefix) { int i; int print = 0; int flags = 0; + const char *refname; if (argc == 2 && !strcmp(argv[1], "-h")) usage(builtin_check_ref_format_usage); @@ -81,11 +76,14 @@ int cmd_check_ref_format(int argc, const char **argv, const char *prefix) if (! (i == argc - 1)) usage(builtin_check_ref_format_usage); - if (check_refname_format(argv[i], flags)) + refname = argv[i]; + if (check_refname_format(refname, flags)) return 1; - if (print) - refname_format_print(argv[i]); + if (print) { + refname = collapse_slashes(refname); + printf("%s\n", refname); + } return 0; }