From: Michael Haggerty Date: Tue, 26 Jul 2011 14:12:55 GMT Subject: [PATCH 12/19] git-check-attr: Extract a function error_with_usage() Message-ID: <1311689582-3116-13-git-send-email-mhagger@alum.mit.edu> In-Reply-To: <1311689582-3116-1-git-send-email-mhagger@alum.mit.edu> Signed-off-by: Michael Haggerty --- builtin/check-attr.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/builtin/check-attr.c b/builtin/check-attr.c index c527078..d004222 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)); -- 1.7.6.8.gd2879