From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Thu, 4 Aug 2011 04:36:26 +0000 (+0200)
Subject: git-check-attr: Extract a function error_with_usage()
X-Git-Tag: v1.7.7-rc0~23^2~13
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9e37a7e126c98513789ce60c4bec67d7940dbf4b;p=git-core%2Fgit.git

git-check-attr: Extract a function error_with_usage()

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/check-attr.c b/builtin/check-attr.c
index c5270786d..d0042227c 100644
--- a/builtin/check-attr.c
+++ b/builtin/check-attr.c
@@ -68,6 +68,12 @@ static void check_attr_stdin_paths(int cnt, struct git_attr_check *check)
 	strbuf_release(&nbuf);
 }
 
+static NORETURN void error_with_usage(const char *msg)
+{
+	error("%s", msg);
+	usage_with_options(check_attr_usage, check_attr_options);
+}
+
 int cmd_check_attr(int argc, const char **argv, const char *prefix)
 {
 	struct git_attr_check *check;
@@ -103,8 +109,7 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
 	else if (stdin_paths && filei < argc)
 		errstr = "Can't specify files with --stdin";
 	if (errstr) {
-		error("%s", errstr);
-		usage_with_options(check_attr_usage, check_attr_options);
+		error_with_usage(errstr);
 	}
 
 	check = xcalloc(cnt, sizeof(*check));