From patchwork Tue Jun 2 04:16:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Couder X-Patchwork-Id: 11582883 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 7F1C11392 for ; Tue, 2 Jun 2020 04:17:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6776A207D5 for ; Tue, 2 Jun 2020 04:17:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="vX6SVsbZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726012AbgFBERX (ORCPT ); Tue, 2 Jun 2020 00:17:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725930AbgFBERV (ORCPT ); Tue, 2 Jun 2020 00:17:21 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98082C061A0E for ; Mon, 1 Jun 2020 21:17:20 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id c3so1850608wru.12 for ; Mon, 01 Jun 2020 21:17:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rIAqGSr0E2QrY1BV92Agexl6dH59N7rlDPfpK3T3/fg=; b=vX6SVsbZdJGMNx5LPbdAUnbbSzjlUTRIvipbgjsbnzwlyeMm4qGrALkh/TWZrjzL04 pP7nELJKTsIQN5ftXXfrb/i4MwBk52RCILbwqflpi5OS6ym+NpD9x26++XW7HM8OqPcC g97zEfuUtj9eY2KEKO2CD6Vx2JCEDX5tebBVKB+FuUzIkr2usxLnjuS3B1dtSwT1+HiB syJUUA9ojqdAz6HEqFKygrdA+PAE86Q0Ap7PyVH4xWy46Lz5aGmQHnPBYf4BjazkUDAd izup+lcSDas4zaVi76zOP18rwqRnd8fkdtn+lAVS+mSmhQw4CRHvTGTg49Q6knf/agjG aI9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rIAqGSr0E2QrY1BV92Agexl6dH59N7rlDPfpK3T3/fg=; b=WYsgkAQU4ZiTxTmcY/cyc4u2kUUoqojABETF/153OFIdunjm8njOcUWgiR/0USApne piIcx97CrbxUfh3Yuq/QVDIckb3OMIv+1BLM5pCSFZTh3tqj81S036+Ymc/TkHuY4CmB vOjzgbFKr0VpgSw6NdL7C4N6vpAwPL7chMvCfGI2Bs55sEy3OxhXRqwYYXf6irI53U6o cs87ZmBI03GFAb7OIEjHTM5h9/bYmjzNwLnSOl0JrTEfvQ/Bk/Rf/K9QpCNdOOIBSv6a yMfwTJVUdGIZUK1eUeJ81cnV1Ri63CIu/Y7N9rjHLpN1bXlO7UTcAbDCfMTvWGAgggDW W1Hg== X-Gm-Message-State: AOAM531MtOaKlV+ONbdPnuAcBMwj+1zXUlbD9SwKbx61atAq+wWHbG7q VS/IW1f0l3FonGfToQAq+E4w5n7TqvQ= X-Google-Smtp-Source: ABdhPJzEmSpqhspflswXLBPpdm92zqhmJNxlKcsT5UdyvHuOk2L0XsCmkuFUfInLR963g9tspkoTIA== X-Received: by 2002:adf:fd41:: with SMTP id h1mr25614206wrs.374.1591071439073; Mon, 01 Jun 2020 21:17:19 -0700 (PDT) Received: from localhost.localdomain ([185.228.230.249]) by smtp.gmail.com with ESMTPSA id z2sm1717614wrs.87.2020.06.01.21.17.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jun 2020 21:17:18 -0700 (PDT) From: Christian Couder X-Google-Original-From: Christian Couder To: git@vger.kernel.org Cc: Junio C Hamano , Derrick Stolee , Jeff King , Taylor Blau , Jonathan Tan , Jonathan Nieder , Christian Couder Subject: [PATCH v2 02/13] upload-pack: annotate upload_pack_data fields Date: Tue, 2 Jun 2020 06:16:46 +0200 Message-Id: <20200602041657.7132-3-chriscool@tuxfamily.org> X-Mailer: git-send-email 2.27.0.rc0.26.gf2851482f5 In-Reply-To: <20200602041657.7132-1-chriscool@tuxfamily.org> References: <20200527164742.23067-1-chriscool@tuxfamily.org> <20200602041657.7132-1-chriscool@tuxfamily.org> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org As we cleanup 'upload-pack.c' by using 'struct upload_pack_data' more thoroughly, let's annotate fields from this struct to let people know which ones are used only for protocol v0 and which ones only for protocol v2. Signed-off-by: Christian Couder --- upload-pack.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/upload-pack.c b/upload-pack.c index 2fa645834a..3963a3805e 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -70,12 +70,16 @@ static int allow_ref_in_want; static int allow_sideband_all; +/* + * Please annotate, and if possible group together, fields used only + * for protocol v0 or only for protocol v2. + */ struct upload_pack_data { - struct string_list symref; - struct string_list wanted_refs; + struct string_list symref; /* v0 only */ struct object_array want_obj; struct object_array have_obj; - struct oid_array haves; + struct oid_array haves; /* v2 only */ + struct string_list wanted_refs; /* v2 only */ struct object_array shallows; struct string_list deepen_not; @@ -88,13 +92,14 @@ struct upload_pack_data { struct packet_writer writer; - unsigned stateless_rpc : 1; + unsigned stateless_rpc : 1; /* v0 only */ unsigned use_thin_pack : 1; unsigned use_ofs_delta : 1; unsigned no_progress : 1; unsigned use_include_tag : 1; - unsigned done : 1; + + unsigned done : 1; /* v2 only */ }; static void upload_pack_data_init(struct upload_pack_data *data)