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>

diff --git a/builtin-archive.c b/builtin-archive.c
index da3f71470570a149c168da6532a8e3946e303c59..6dabdee2019d15d7deadfc094d0c1e5f101d09ca 100644 (file)
--- 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;
 }
 
        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];
 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)
 
        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;
                ar->args.extra = ar->parse_extra(extra_argc, extra_argv);
        }
        ar->args.verbose = verbose;