From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-6.3 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 2E9C11FEB3 for ; Thu, 12 Jan 2017 23:55:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750863AbdALXz1 (ORCPT ); Thu, 12 Jan 2017 18:55:27 -0500 Received: from mail-pf0-f169.google.com ([209.85.192.169]:33168 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750817AbdALXz0 (ORCPT ); Thu, 12 Jan 2017 18:55:26 -0500 Received: by mail-pf0-f169.google.com with SMTP id y143so20696963pfb.0 for ; Thu, 12 Jan 2017 15:54:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=U40i0OnoS3mVkoPcs89wOZX8JJo773wQdQkbnEfPQ0k=; b=KmEkS0k7l7pu9vv0uptz0k9deIXJ1V7qVEueNoYnJ09bR2UK1G7JjhHMdNCY2KE/hj XXQSf3Omn5c/5IVEILkyn1cOsw9KFSTZIQxU5WsPb20XiMhqg+Y3GesaKuxcPerttOzX PIpVqsgg7Kujp5xGApN+TOIomzO5c82YYee8xWTvMvhNWN7bAW2OFeLiU+Z/cPzO7O+5 Ld9mPVAT27W8FfcBRhWaanfUAabbJWG2/MhqkLN6cQLnrvW/QsS+zQjAE+a3jnGzlNwd 5sCaPh2qtzPfqkBTIaMLpaDmIZ6+bHyP3rIcoU4WjZO7v7MihkhDcZEeii9Rvc6iGs8r nzsg== 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; bh=U40i0OnoS3mVkoPcs89wOZX8JJo773wQdQkbnEfPQ0k=; b=iy+unNTlz8QNH4DclfTsU/MfKScpaRxDr5x1BNLfJ0Ru5RdJKYLsqAW01Gu26xb+es uNFBwaQd+vKT4SYPUs7TmXCt2ikjQEJrSEeQ9GVPZqBiFp+TjxqCMS8qR1PltMK+qJPG XZoo8goeGk3OkomTYiI2tzWvGNGEKdaSQUnjEMkFYnxzFhqQM5XNIi7zfF3pk8fu0hMO 5x52tznyAIx/q9+3wIA9c4fMvzrkhvK4uDKMSQwPo/pI+zUtayPAcZxWa2frBXKTdLcA tXqG92d7S+KyHsMRLXu6dFZXynQYJ+uPbh1UVOELsNFOk4du95rZAnh/bBzZsfS32Qcb 7Z5g== X-Gm-Message-State: AIkVDXLuJeHCEkOJq+CtYyWzewkxBHMEZLK160FJFpG4d9aSVhRcxplh4yP7iX/11zVpZbQQ X-Received: by 10.99.6.140 with SMTP id 134mr20492267pgg.53.1484265272236; Thu, 12 Jan 2017 15:54:32 -0800 (PST) Received: from roshar.mtv.corp.google.com ([100.96.238.26]) by smtp.gmail.com with ESMTPSA id e6sm24312192pgf.4.2017.01.12.15.54.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Jan 2017 15:54:30 -0800 (PST) From: Brandon Williams To: git@vger.kernel.org Cc: Brandon Williams , gitster@pobox.com, pclouds@gmail.com, sbeller@google.com Subject: [PATCH 19/27] attr: pass struct attr_check to collect_some_attrs Date: Thu, 12 Jan 2017 15:53:46 -0800 Message-Id: <20170112235354.153403-20-bmwill@google.com> X-Mailer: git-send-email 2.11.0.390.gc69c2f50cf-goog In-Reply-To: <20170112235354.153403-1-bmwill@google.com> References: <20170112235354.153403-1-bmwill@google.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The old callchain used to take an array of attr_check_item items. Instead pass the 'attr_check' container object to 'collect_some_attrs()' and access the fields in the data structure directly. Signed-off-by: Brandon Williams --- attr.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/attr.c b/attr.c index da727e3fd..e58fa340c 100644 --- a/attr.c +++ b/attr.c @@ -777,9 +777,7 @@ static int macroexpand_one(int nr, int rem) * check_all_attr. If num is non-zero, only attributes in check[] are * collected. Otherwise all attributes are collected. */ -static void collect_some_attrs(const char *path, int num, - struct attr_check_item *check) - +static void collect_some_attrs(const char *path, struct attr_check *check) { struct attr_stack *stk; int i, pathlen, rem, dirlen; @@ -802,17 +800,18 @@ static void collect_some_attrs(const char *path, int num, prepare_attr_stack(path, dirlen); for (i = 0; i < attr_nr; i++) check_all_attr[i].value = ATTR__UNKNOWN; - if (num && !cannot_trust_maybe_real) { + if (check->check_nr && !cannot_trust_maybe_real) { rem = 0; - for (i = 0; i < num; i++) { - if (!check[i].attr->maybe_real) { + for (i = 0; i < check->check_nr; i++) { + const struct git_attr *a = check->check[i].attr; + if (!a->maybe_real) { struct attr_check_item *c; - c = check_all_attr + check[i].attr->attr_nr; + c = check_all_attr + a->attr_nr; c->value = ATTR__UNSET; rem++; } } - if (rem == num) + if (rem == check->check_nr) return; } @@ -821,18 +820,17 @@ static void collect_some_attrs(const char *path, int num, rem = fill(path, pathlen, basename_offset, stk, rem); } -static int git_check_attrs(const char *path, int num, - struct attr_check_item *check) +int git_check_attr(const char *path, struct attr_check *check) { int i; - collect_some_attrs(path, num, check); + collect_some_attrs(path, check); - for (i = 0; i < num; i++) { - const char *value = check_all_attr[check[i].attr->attr_nr].value; + for (i = 0; i < check->check_nr; i++) { + const char *value = check_all_attr[check->check[i].attr->attr_nr].value; if (value == ATTR__UNKNOWN) value = ATTR__UNSET; - check[i].value = value; + check->check[i].value = value; } return 0; @@ -843,7 +841,7 @@ void git_all_attrs(const char *path, struct attr_check *check) int i; attr_check_reset(check); - collect_some_attrs(path, check->check_nr, check->check); + collect_some_attrs(path, check); for (i = 0; i < attr_nr; i++) { const char *name = check_all_attr[i].attr->name; @@ -856,11 +854,6 @@ void git_all_attrs(const char *path, struct attr_check *check) } } -int git_check_attr(const char *path, struct attr_check *check) -{ - return git_check_attrs(path, check->check_nr, check->check); -} - struct attr_check *attr_check_alloc(void) { return xcalloc(1, sizeof(struct attr_check)); -- 2.11.0.390.gc69c2f50cf-goog