From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 523131F4B4 for ; Sat, 23 Jan 2021 21:07:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726284AbhAWVDG (ORCPT ); Sat, 23 Jan 2021 16:03:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725765AbhAWVDF (ORCPT ); Sat, 23 Jan 2021 16:03:05 -0500 Received: from mail-qk1-x72c.google.com (mail-qk1-x72c.google.com [IPv6:2607:f8b0:4864:20::72c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99334C0613D6 for ; Sat, 23 Jan 2021 13:02:24 -0800 (PST) Received: by mail-qk1-x72c.google.com with SMTP id x81so6012251qkb.0 for ; Sat, 23 Jan 2021 13:02:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=AdMrW+VPtcfgNu/I9acQ3gKGnN1fmoIOabg/OfF9kYg=; b=eFZIDtp7S2VJrh27V7DSmmqHo4R5fiZ02QjvDMtTiyOKaORoKKUTRzZU7BxK2ZotVs XmC1Ve7O7y1CAs8L1hvFk/7V52jXc0ZvMdKPEOz3qnykg8L/wEvTTab9QLkmQt89eXn+ pm5SHT1X7fPOOWedmGMDjPBdJ6N2Oif0A5pMoEjKpMqX0YDqccOZixl6EIVEVFhDxWy9 48xpslIej1alLieUlvhDbzB+vp2mu/LBIbQCcBA6GRVI7anTbxUIPbYEF5lS+Blxrknr 4lP6CwpETDxJtdf/ORA0+WjymcyfLIJqlkVhTu1ohuhuNhD+9rgQkwJ7lUws3lKCzegd RgEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=AdMrW+VPtcfgNu/I9acQ3gKGnN1fmoIOabg/OfF9kYg=; b=CYARYhrg9xjTagO6//BhCJD/S039UfnXfmEgQGeIfohg2AzkK4j6LlLSOR8WFSj12O i7gU++EnJahSWLBpwELBoauYlVm607eiJ5PtqBlyJXYcokY70+GHiZFnbn9rmboqvjeL QDVsOUmgWEAcPWJ68Req9L2Uk6iXwGysN8pGgQfGnO6UD6ZRl/c3BV75JE/kARsF8niO qeZQtrXdotj0rFdA9TSRtmEW9w5mNqg8BQi9MyGQBZd/CP48dcv6o6CSCsOr+i4OLaYY yhURnkUvaFUICUUsGmXhXQD+zz0fKK0edZ0kYTC5wySKCLwRtGB+oaGHVif7LM/+R3P8 RHxA== X-Gm-Message-State: AOAM533E9wzULHqwedNdyOdyVIktDWOEGOJ7eGBYmDucDq4VXFvgjL5j cPkkHIAWEvND5Ue+dKeZG7c= X-Google-Smtp-Source: ABdhPJyyxsl32jruoWB4RQnAsEymcmfNPt59CLM1arFwiNQqphIWEtwqX0/4izNRnJ1BmsObh/MZWw== X-Received: by 2002:ae9:f20b:: with SMTP id m11mr1941365qkg.464.1611435743464; Sat, 23 Jan 2021 13:02:23 -0800 (PST) Received: from ?IPv6:2600:1700:e72:80a0:98e8:103:e6ee:9536? ([2600:1700:e72:80a0:98e8:103:e6ee:9536]) by smtp.gmail.com with UTF8SMTPSA id l20sm9000973qki.129.2021.01.23.13.02.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 23 Jan 2021 13:02:22 -0800 (PST) Subject: Re: [PATCH v3 2/9] cache-tree: simplify verify_cache() prototype To: Elijah Newren , Derrick Stolee via GitGitGadget Cc: Git Mailing List , Junio C Hamano , Derrick Stolee , Derrick Stolee References: <1b8b56800948339c0e0387555698bdfdc80a19ad.1611431900.git.gitgitgadget@gmail.com> From: Derrick Stolee Message-ID: Date: Sat, 23 Jan 2021 16:02:22 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:85.0) Gecko/20100101 Thunderbird/85.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 1/23/2021 3:24 PM, Elijah Newren wrote: > On Sat, Jan 23, 2021 at 11:58 AM Derrick Stolee via GitGitGadget > wrote: >> - for (i = 0; i < entries - 1; i++) { >> + for (i = 0; i + 1 < istate->cache_nr; i++) { >> /* path/file always comes after path because of the way >> * the cache is sorted. Also path can appear only once, >> * which means conflicting one would immediately follow. >> */ >> - const struct cache_entry *this_ce = cache[i]; >> - const struct cache_entry *next_ce = cache[i + 1]; >> + const struct cache_entry *this_ce = istate->cache[i]; >> + const struct cache_entry *next_ce = istate->cache[i + 1]; >> const char *this_name = this_ce->name; >> const char *next_name = next_ce->name; >> int this_len = ce_namelen(this_ce); > Makes sense. Thanks for explaining the i + 1 < istate->cache_nr bit > in the commit message; made it easier to read through quickly. I'm > curious if it deserves a comment in the code too, since it does feel > slightly unusual. I would argue that "i + 1 < N" is a more natural way to write this, because we use "i + 1" as an index, so we want to ensure the index we are about to use is within range. "i < N - 1" is the backwards way to write that statement. Thanks, -Stolee