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-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-4.0 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,RCVD_IN_DNSWL_LOW, 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 A41181FB07 for ; Fri, 13 Aug 2021 08:25:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238886AbhHMIYF (ORCPT ); Fri, 13 Aug 2021 04:24:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238650AbhHMIXu (ORCPT ); Fri, 13 Aug 2021 04:23:50 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 420E7C0612E7 for ; Fri, 13 Aug 2021 01:23:23 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id o7-20020a05600c5107b0290257f956e02dso9083009wms.1 for ; Fri, 13 Aug 2021 01:23:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=3drzlXPZkamKQqKZG3sXGWeLRwxrKrGClhbtE40WJZI=; b=m48vTzG/2ZAK737JlrjcrNchv7e+DvzdofjWP2v095mmFCZujdsQK85T+LOSa3Hz2K eoTRgqhFBrwp5LDfEI2rr0EHjTsfOmvuP7ZXz17UsdT5OvCzi/v5962noPtvkSJhGeTb 2330YRNGFVLByh1eZQq4zIILF/srflhFn/stAnQNdS6nY4ZvIJ+D5m8fEcqELrvnAkgD nOrZXWzNdXdoenQGnu0d2XceQ/ACRXmzJdQ3W9xjhZFdUu+90ZBTphfUJYhY39TSlPcc 52YUzVvIdCkKWr9DF5joT3t3RLL4dl43lImbSwxFmSzLKfD4FvPVMEKq1HJpUKEfXLFi OOcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=3drzlXPZkamKQqKZG3sXGWeLRwxrKrGClhbtE40WJZI=; b=l5FvW3f6CLs1CmGL17zN0CidcJme8uztf6qlqhlrksiCG5ElXO31InO0YYqAQtmjJk IkbAgxcLJRmeAfuPZoEKaTwWQ+mo6MDJHhe6Ns7AHD5AhKt2I38xRb3Kt9aI3BWwwskp ZD0N4BYk/Dy+jjC7Wh5YszRBZlizNscaVxk8abJN2MDHzuLGy9b/P9s+/Xrt2wCR4Ikh WKFdCNimVwurWwxNaLetfxu8X2osCRj/vQIjo3C/LwoJR2iO2x+gNlCUJY2t0mCJkzG8 tJcoPOfXibz6D/t2skr3Ll6xgllXXvkB3ZI23xG7K14b7kqotCklHcOc0hJJLahFlejc TD3A== X-Gm-Message-State: AOAM531FoiwWqV+dOPOJu1hL2JkZgWxXA2KGTE1+HYFo7wtJMlPXVTgh 3zt7NuW5xxxLDVw5uSdDnQnoPSbKXTI= X-Google-Smtp-Source: ABdhPJzdJjhrKsW7wWSDhXV7Vd5lIJIthZqRLeVo5xAdaMCw68clVJBlse5lJqoNMnUz1Eq4nWfqxg== X-Received: by 2002:a1c:4b0a:: with SMTP id y10mr1374866wma.111.1628843001932; Fri, 13 Aug 2021 01:23:21 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id u25sm682828wml.8.2021.08.13.01.23.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Aug 2021 01:23:21 -0700 (PDT) Message-Id: In-Reply-To: References: From: "ZheNing Hu via GitGitGadget" Date: Fri, 13 Aug 2021 08:22:59 +0000 Subject: [PATCH 16/27] [GSOC] ref-filter: remove grab_oid() function Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Christian Couder , Hariom Verma , Bagas Sanjaya , Jeff King , =?UTF-8?Q?=C3=86var_Arnfj=C3=B6r=C3=B0?= Bjarmason , Eric Sunshine , Philip Oakley , ZheNing Hu , ZheNing Hu Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: ZheNing Hu Because "atom_type == ATOM_OBJECTNAME" implies the condition of `starts_with(name, "objectname")`, "atom_type == ATOM_TREE" implies the condition of `starts_with(name, "tree")`, so the check for `starts_with(name, field)` in grab_oid() is redundant. So Remove the grab_oid() from ref-filter, to reduce repeated check. Mentored-by: Christian Couder Mentored-by: Hariom Verma Signed-off-by: ZheNing Hu --- ref-filter.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/ref-filter.c b/ref-filter.c index f7c448f6fa1..8664d9a6f4e 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1081,16 +1081,6 @@ static const char *do_grab_oid(const char *field, const struct object_id *oid, } } -static int grab_oid(const char *name, const char *field, const struct object_id *oid, - struct atom_value *v, struct used_atom *atom) -{ - if (starts_with(name, field)) { - v->s = xstrdup(do_grab_oid(field, oid, atom)); - return 1; - } - return 0; -} - /* See grab_values */ static void grab_common_values(struct atom_value *val, int deref, struct expand_data *oi) { @@ -1116,8 +1106,9 @@ static void grab_common_values(struct atom_value *val, int deref, struct expand_ } } else if (atom_type == ATOM_DELTABASE) v->s = xstrdup(oid_to_hex(&oi->delta_base_oid)); - else if (atom_type == ATOM_OBJECTNAME && deref) - grab_oid(name, "objectname", &oi->oid, v, &used_atom[i]); + else if (atom_type == ATOM_OBJECTNAME && deref) { + v->s = xstrdup(do_grab_oid("objectname", &oi->oid, &used_atom[i])); + } } } @@ -1158,9 +1149,10 @@ static void grab_commit_values(struct atom_value *val, int deref, struct object continue; if (deref) name++; - if (atom_type == ATOM_TREE && - grab_oid(name, "tree", get_commit_tree_oid(commit), v, &used_atom[i])) + if (atom_type == ATOM_TREE) { + v->s = xstrdup(do_grab_oid("tree", get_commit_tree_oid(commit), &used_atom[i])); continue; + } if (atom_type == ATOM_NUMPARENT) { v->value = commit_list_count(commit->parents); v->s = xstrfmt("%lu", (unsigned long)v->value); @@ -1965,9 +1957,9 @@ static int populate_value(struct ref_array_item *ref, struct strbuf *err) v->s = xstrdup(buf + 1); } continue; - } else if (!deref && atom_type == ATOM_OBJECTNAME && - grab_oid(name, "objectname", &ref->objectname, v, atom)) { - continue; + } else if (!deref && atom_type == ATOM_OBJECTNAME) { + v->s = xstrdup(do_grab_oid("objectname", &ref->objectname, atom)); + continue; } else if (atom_type == ATOM_HEAD) { if (atom->u.head && !strcmp(ref->refname, atom->u.head)) v->s = xstrdup("*"); -- gitgitgadget