From patchwork Mon Jun 22 21:48:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff King X-Patchwork-Id: 11619191 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3D91D13B1 for ; Mon, 22 Jun 2020 21:48:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2CE852078E for ; Mon, 22 Jun 2020 21:48:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730770AbgFVVsI (ORCPT ); Mon, 22 Jun 2020 17:48:08 -0400 Received: from cloud.peff.net ([104.130.231.41]:39352 "EHLO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730694AbgFVVsG (ORCPT ); Mon, 22 Jun 2020 17:48:06 -0400 Received: (qmail 1943 invoked by uid 109); 22 Jun 2020 21:48:06 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.94) with ESMTP; Mon, 22 Jun 2020 21:48:06 +0000 Authentication-Results: cloud.peff.net; auth=none Received: (qmail 8591 invoked by uid 111); 22 Jun 2020 21:48:06 -0000 Received: from coredump.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.2) by peff.net (qpsmtpd/0.94) with (TLS_AES_256_GCM_SHA384 encrypted) ESMTPS; Mon, 22 Jun 2020 17:48:06 -0400 Authentication-Results: peff.net; auth=none Date: Mon, 22 Jun 2020 17:48:05 -0400 From: Jeff King To: git@vger.kernel.org Cc: Eric Sunshine , Junio C Hamano , Johannes Schindelin Subject: [PATCH v2 3/4] fast-export: refactor path printing to not rely on stdout Message-ID: <20200622214805.GC3303964@coredump.intra.peff.net> References: <20200622214745.GA3302779@coredump.intra.peff.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200622214745.GA3302779@coredump.intra.peff.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org We'll be using print_path_1() in more places in a subsequent patch, so let's teach it to take the output handle as a parameter. Signed-off-by: Jeff King --- builtin/fast-export.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index faaab6c7e9..aa7ac9761d 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -369,15 +369,15 @@ static int depth_first(const void *a_, const void *b_) return (a->status == 'R') - (b->status == 'R'); } -static void print_path_1(const char *path) +static void print_path_1(FILE *out, const char *path) { int need_quote = quote_c_style(path, NULL, NULL, 0); if (need_quote) - quote_c_style(path, NULL, stdout, 0); + quote_c_style(path, NULL, out, 0); else if (strchr(path, ' ')) - printf("\"%s\"", path); + fprintf(out, "\"%s\"", path); else - printf("%s", path); + fprintf(out, "%s", path); } static void *anonymize_path_component(const void *path, size_t *len) @@ -391,13 +391,13 @@ static void *anonymize_path_component(const void *path, size_t *len) static void print_path(const char *path) { if (!anonymize) - print_path_1(path); + print_path_1(stdout, path); else { static struct hashmap paths; static struct strbuf anon = STRBUF_INIT; anonymize_path(&anon, path, &paths, anonymize_path_component); - print_path_1(anon.buf); + print_path_1(stdout, anon.buf); strbuf_reset(&anon); } }