git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* [PATCH 3/4] parse-options: add new function "usage_msg_opt"
@ 2009-02-02  5:12 Christian Couder
  0 siblings, 0 replies; only message in thread
From: Christian Couder @ 2009-02-02  5:12 UTC (permalink / raw
  To: Junio C Hamano, Pierre Habouzit; +Cc: git

This function can be used instead of "usage_with_options" when you
want to print an error message before the usage string.

It may be useful because:

if (condition)
	usage_msg_opt("condition is false", usage, opts);

is shorter than:

if (condition) {
	fprintf(stderr, "condition is false\n\n");
	usage_with_options(usage, opts);
}

and may be more consistent.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 parse-options.c |    8 ++++++++
 parse-options.h |    4 ++++
 2 files changed, 12 insertions(+), 0 deletions(-)

	This patch may be generaly useful.

diff --git a/parse-options.c b/parse-options.c
index 4c5d09d..7a5fde8 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -449,6 +449,14 @@ void usage_with_options(const char * const *usagestr,
 	exit(129);
 }
 
+void usage_msg_opt(const char *msg,
+		   const char * const *usagestr,
+		   const struct option *options)
+{
+	fprintf(stderr, "%s\n\n", msg);
+	usage_with_options(usagestr, options);
+}
+
 int parse_options_usage(const char * const *usagestr,
 			const struct option *opts)
 {
diff --git a/parse-options.h b/parse-options.h
index 9122905..6061a19 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -113,6 +113,10 @@ extern int parse_options(int argc, const char **argv,
 extern NORETURN void usage_with_options(const char * const *usagestr,
                                         const struct option *options);
 
+extern NORETURN void usage_msg_opt(const char *msg,
+				   const char * const *usagestr,
+				   const struct option *options);
+
 /*----- incremantal advanced APIs -----*/
 
 enum {
-- 
1.6.1.2.353.g99fdd.dirty

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2009-02-02  5:14 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-02  5:12 [PATCH 3/4] parse-options: add new function "usage_msg_opt" Christian Couder

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).