mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-05 10:36:11 +02:00
Code

parse-options: add new function "usage_msg_opt" 

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2009-02-02 06:12:58 +01:00 committed by Junio C Hamano
parent bebdd271ff
commit 451bb210f8
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-replace.c
View File

@ -121,7 +121,7 @@ int cmd_replace(int argc, const char **argv, const char *prefix)
OPT_END()
};
argc = parse_options(argc, argv, options, git_replace_usage, 0);
argc = parse_options(argc, argv, prefix, options, git_replace_usage, 0);
if (list && delete)
usage_with_options(git_replace_usage, options);

8
parse-options.c
View File

@ -555,6 +555,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)
{

4
parse-options.h
View File

@ -132,6 +132,10 @@ extern int parse_options(int argc, const char **argv, const char *prefix,
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);
/*----- incremental advanced APIs -----*/
enum {