diff options
| author | Rene Scharfe <rene.scharfe@lsrfire.ath.cx> | 2006-09-13 22:55:04 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-13 23:37:14 -0700 |
| commit | 2232c0c69ff114a23011a0698b119aeea0272e8b (patch) | |
| tree | aa26e29ecf865a7e9a9c05681b10765e362973a0 | |
| parent | d751864cf7f5253da1ce749cf71215466590037f (diff) | |
| download | git-2232c0c69ff114a23011a0698b119aeea0272e8b.tar.gz | |
git-archive: inline default_parse_extra()
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | builtin-archive.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/builtin-archive.c b/builtin-archive.c index da3f714705..6dabdee201 100644 --- a/builtin-archive.c +++ b/builtin-archive.c @@ -145,17 +145,6 @@ void parse_treeish_arg(const char **argv, struct archiver_args *ar_args, ar_args->time = archive_time; } -static const char *default_parse_extra(struct archiver *ar, - const char **argv) -{ - static char msg[64]; - - snprintf(msg, sizeof(msg) - 4, "'%s' format does not handle %s", - ar->name, *argv); - - return strcat(msg, "..."); -} - int parse_archive_args(int argc, const char **argv, struct archiver *ar) { const char *extra_argv[MAX_EXTRA_ARGS]; @@ -208,7 +197,8 @@ int parse_archive_args(int argc, const char **argv, struct archiver *ar) if (extra_argc) { if (!ar->parse_extra) - die("%s", default_parse_extra(ar, extra_argv)); + die("'%s' format does not handle %s", + ar->name, extra_argv[0]); ar->args.extra = ar->parse_extra(extra_argc, extra_argv); } ar->args.verbose = verbose; |