From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH v3 11/25] fetch-pack: use a common function for verbose printing Date: Tue, 23 Feb 2016 20:44:49 +0700 Message-ID: <1456235103-26317-12-git-send-email-pclouds@gmail.com> References: <1456235103-26317-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Junio C Hamano , Eric Sunshine , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Feb 23 14:46:16 2016 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aYDHv-0000MH-7g for gcvg-git-2@plane.gmane.org; Tue, 23 Feb 2016 14:46:03 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752781AbcBWNp6 convert rfc822-to-quoted-printable (ORCPT ); Tue, 23 Feb 2016 08:45:58 -0500 Received: from mail-pf0-f176.google.com ([209.85.192.176]:35981 "EHLO mail-pf0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751864AbcBWNp5 (ORCPT ); Tue, 23 Feb 2016 08:45:57 -0500 Received: by mail-pf0-f176.google.com with SMTP id e127so112868716pfe.3 for ; Tue, 23 Feb 2016 05:45:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=gAxX2n2+BlWA/OQjld4FKKCiAfDdXCota8swUB8HjVk=; b=iRz+VYGmmbieuaLHxIfwBSG1OaAG2iGv834bXYt6YCJZkE3fOPPlVvSANigMAsrnHi 1+c+YV1uBgHK0LdaRVILJZUvyHiWDJsWTAzq8sp7JR1Vw+tylQ99TvYDApuZXyXHjsqU IZEUQiLBszjeb61uP8egnEDdxGyvkqSOUxR3ObyK2gEIztuq/CHS6a2UpFk95D9fcD1B +ZLhnuTlxIAP/xLtK6VQfAbIAbFFF5GsJwJiuhxOcvyfPuTgxz5eqzs0bdNN85Mk00DD +ISRdOh/JimRZClrTrVwrIQORNpxbCjzV6aHTtTa0XBaNhnQ2KQinRY9bMD1k+YDLuc3 gTaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=gAxX2n2+BlWA/OQjld4FKKCiAfDdXCota8swUB8HjVk=; b=PpdferrYprPasqUbJxnJPGye8XrRlLI27fOC7TLNs3TRWzwZlbJAGZCyUQuejckB3E Ue5hwgSDkY4UySUB9aIwJujq6FlYjqjUFRRclvjfnsezEe77vq6q4V9VoDSgZDXjfm8E rntzHw1AR71RB+A8F/XckxpQXfdlKRGm2jhgW0pc4e2U5p5QSvEy4OYUQtwm3NSCuNmq Cr1leqKvD4Jb3qGabp9GeE47CKNllItneA/YX51yqh9IfBYpW3YKlRMVMR4qOvSI12UG n/ejawYTGCaftVL6bM4bIgi6Zt33DfsFj8cei5jiJNftNhdaxkKUIzQjKSNk52apniB5 hj3A== X-Gm-Message-State: AG10YOTEGS3WVdFQVEfRUj4dsM9SF7Dp12jRpZ4JaCM/HwoSplsuTfTB7YCN+PSmeWmLdQ== X-Received: by 10.98.10.149 with SMTP id 21mr46552728pfk.75.1456235156831; Tue, 23 Feb 2016 05:45:56 -0800 (PST) Received: from lanh ([115.76.228.161]) by smtp.gmail.com with ESMTPSA id sm8sm44627169pac.43.2016.02.23.05.45.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Feb 2016 05:45:55 -0800 (PST) Received: by lanh (sSMTP sendmail emulation); Tue, 23 Feb 2016 20:46:25 +0700 X-Mailer: git-send-email 2.7.1.532.gd9e3aaa In-Reply-To: <1456235103-26317-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This reduces the number of "if (verbose)" which makes it a bit easier to read imo. It also makes it easier to redirect all these printouts, to a file for example. Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- fetch-pack.c | 88 +++++++++++++++++++++++++++++-----------------------= -------- 1 file changed, 42 insertions(+), 46 deletions(-) diff --git a/fetch-pack.c b/fetch-pack.c index 01e34b6..4020744 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -50,6 +50,21 @@ static int non_common_revs, multi_ack, use_sideband; #define ALLOW_REACHABLE_SHA1 02 static unsigned int allow_unadvertised_object_request; =20 +__attribute__((format (printf, 2, 3))) +static inline void print_verbose(const struct fetch_pack_args *args, + const char *fmt, ...) +{ + va_list params; + + if (!args->verbose) + return; + + va_start(params, fmt); + vfprintf(stderr, fmt, params); + va_end(params); + fputc('\n', stderr); +} + static void rev_list_push(struct commit *commit, int mark) { if (!(commit->object.flags & mark)) { @@ -375,8 +390,7 @@ static int find_common(struct fetch_pack_args *args= , retval =3D -1; while ((sha1 =3D get_rev())) { packet_buf_write(&req_buf, "have %s\n", sha1_to_hex(sha1)); - if (args->verbose) - fprintf(stderr, "have %s\n", sha1_to_hex(sha1)); + print_verbose(args, "have %s", sha1_to_hex(sha1)); in_vain++; if (flush_at <=3D ++count) { int ack; @@ -397,9 +411,9 @@ static int find_common(struct fetch_pack_args *args= , consume_shallow_list(args, fd[0]); do { ack =3D get_ack(fd[0], result_sha1); - if (args->verbose && ack) - fprintf(stderr, "got ack %d %s\n", ack, - sha1_to_hex(result_sha1)); + if (ack) + print_verbose(args, "got ack %d %s", ack, + sha1_to_hex(result_sha1)); switch (ack) { case ACK: flushes =3D 0; @@ -438,8 +452,7 @@ static int find_common(struct fetch_pack_args *args= , } while (ack); flushes--; if (got_continue && MAX_IN_VAIN < in_vain) { - if (args->verbose) - fprintf(stderr, "giving up\n"); + print_verbose(args, "giving up"); break; /* give up */ } } @@ -449,8 +462,7 @@ done: packet_buf_write(&req_buf, "done\n"); send_request(args, fd[1], &req_buf); } - if (args->verbose) - fprintf(stderr, "done\n"); + print_verbose(args, "done"); if (retval !=3D 0) { multi_ack =3D 0; flushes++; @@ -462,9 +474,8 @@ done: while (flushes || multi_ack) { int ack =3D get_ack(fd[0], result_sha1); if (ack) { - if (args->verbose) - fprintf(stderr, "got ack (%d) %s\n", ack, - sha1_to_hex(result_sha1)); + print_verbose(args, "got ack (%d) %s", ack, + sha1_to_hex(result_sha1)); if (ack =3D=3D ACK) return 0; multi_ack =3D 1; @@ -509,9 +520,8 @@ static void mark_recent_complete_commits(struct fet= ch_pack_args *args, unsigned long cutoff) { while (complete && cutoff <=3D complete->item->date) { - if (args->verbose) - fprintf(stderr, "Marking %s as complete\n", - oid_to_hex(&complete->item->object.oid)); + print_verbose(args, "Marking %s as complete", + oid_to_hex(&complete->item->object.oid)); pop_most_recent_commit(&complete, COMPLETE); } } @@ -652,18 +662,12 @@ static int everything_local(struct fetch_pack_arg= s *args, o =3D lookup_object(remote); if (!o || !(o->flags & COMPLETE)) { retval =3D 0; - if (!args->verbose) - continue; - fprintf(stderr, - "want %s (%s)\n", sha1_to_hex(remote), - ref->name); + print_verbose(args, "want %s (%s)", sha1_to_hex(remote), + ref->name); continue; } - if (!args->verbose) - continue; - fprintf(stderr, - "already have %s (%s)\n", sha1_to_hex(remote), - ref->name); + print_verbose(args, "already have %s (%s)", sha1_to_hex(remote), + ref->name); } return retval; } @@ -810,39 +814,32 @@ static struct ref *do_fetch_pack(struct fetch_pac= k_args *args, if ((args->depth > 0 || is_repository_shallow()) && !server_supports(= "shallow")) die("Server does not support shallow clients"); if (server_supports("multi_ack_detailed")) { - if (args->verbose) - fprintf(stderr, "Server supports multi_ack_detailed\n"); + print_verbose(args, "Server supports multi_ack_detailed"); multi_ack =3D 2; if (server_supports("no-done")) { - if (args->verbose) - fprintf(stderr, "Server supports no-done\n"); + print_verbose(args, "Server supports no-done"); if (args->stateless_rpc) no_done =3D 1; } } else if (server_supports("multi_ack")) { - if (args->verbose) - fprintf(stderr, "Server supports multi_ack\n"); + print_verbose(args, "Server supports multi_ack"); multi_ack =3D 1; } if (server_supports("side-band-64k")) { - if (args->verbose) - fprintf(stderr, "Server supports side-band-64k\n"); + print_verbose(args, "Server supports side-band-64k"); use_sideband =3D 2; } else if (server_supports("side-band")) { - if (args->verbose) - fprintf(stderr, "Server supports side-band\n"); + print_verbose(args, "Server supports side-band"); use_sideband =3D 1; } if (server_supports("allow-tip-sha1-in-want")) { - if (args->verbose) - fprintf(stderr, "Server supports allow-tip-sha1-in-want\n"); + print_verbose(args, "Server supports allow-tip-sha1-in-want"); allow_unadvertised_object_request |=3D ALLOW_TIP_SHA1; } if (server_supports("allow-reachable-sha1-in-want")) { - if (args->verbose) - fprintf(stderr, "Server supports allow-reachable-sha1-in-want\n"); + print_verbose(args, "Server supports allow-reachable-sha1-in-want"); allow_unadvertised_object_request |=3D ALLOW_REACHABLE_SHA1; } if (!server_supports("thin-pack")) @@ -851,17 +848,16 @@ static struct ref *do_fetch_pack(struct fetch_pac= k_args *args, args->no_progress =3D 0; if (!server_supports("include-tag")) args->include_tag =3D 0; - if (server_supports("ofs-delta")) { - if (args->verbose) - fprintf(stderr, "Server supports ofs-delta\n"); - } else + if (server_supports("ofs-delta")) + print_verbose(args, "Server supports ofs-delta"); + else prefer_ofs_delta =3D 0; =20 if ((agent_feature =3D server_feature_value("agent", &agent_len))) { agent_supported =3D 1; - if (args->verbose && agent_len) - fprintf(stderr, "Server version is %.*s\n", - agent_len, agent_feature); + if (agent_len) + print_verbose(args, "Server version is %.*s", + agent_len, agent_feature); } =20 if (everything_local(args, &ref, sought, nr_sought)) { --=20 2.7.1.532.gd9e3aaa