From 2232c0c69ff114a23011a0698b119aeea0272e8b Mon Sep 17 00:00:00 2001 From: Rene Scharfe Date: Wed, 13 Sep 2006 22:55:04 +0200 Subject: [PATCH 1/2] git-archive: inline default_parse_extra() Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- builtin-archive.c | 14 ++------------ 1 file 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; From db830b4f233bd45e28592fbf59395bc98d79dec5 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 13 Sep 2006 18:37:14 -0400 Subject: [PATCH 2/2] wt-status: remove extraneous newline from 'deleted:' output This was accidentally introduced during the fixes to avoid putting newlines inside of colorized output. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- wt-status.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wt-status.c b/wt-status.c index c644331b12..4b74e68584 100644 --- a/wt-status.c +++ b/wt-status.c @@ -78,7 +78,7 @@ static void wt_status_print_filepair(int t, struct diff_filepair *p) p->one->path, p->two->path); break; case DIFF_STATUS_DELETED: - color_printf_ln(c, "deleted: %s", p->one->path); break; + color_printf(c, "deleted: %s", p->one->path); break; case DIFF_STATUS_MODIFIED: color_printf(c, "modified: %s", p->one->path); break; case DIFF_STATUS_RENAMED: