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=-3.8 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_HI, 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 0C8701F9FC for ; Tue, 18 Jan 2022 15:55:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346102AbiARPzi (ORCPT ); Tue, 18 Jan 2022 10:55:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346079AbiARPzg (ORCPT ); Tue, 18 Jan 2022 10:55:36 -0500 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6145C06173F for ; Tue, 18 Jan 2022 07:55:35 -0800 (PST) Received: by mail-wm1-x332.google.com with SMTP id d18-20020a05600c251200b0034974323cfaso6880768wma.4 for ; Tue, 18 Jan 2022 07:55:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9Ft9tXQgPoU/SG9CvZK2TUDKGHqxEj46b1nQVDCP1bk=; b=TqcRY5wBBcup8mfHoRn27KNCiMwwy50VRUb58jfaxWBm01sqScNeoQtzOqMzT6DdVE T2D90LBmLGfM0mmGt0aMokeT2rHuR6Cptgou3nINDQTNYMna7SPQImHoPPR34N3KDkZ3 7O5QHknfmmhJnh1LmeQB2FrCGf67vfT7AIUqlEIPIUmgZdQ4OR4cLlgy4lZjiWce5csV 9GbTqrQ8ZXBP96eBEGwSGbVzvh8ia0Ge+4wRzgil4K4vc+KAgUPpQqVJWsyWugzuWn6F CZb130fgKrAr5LU2482VxgKtu1gHnzRsZh5zwdbidn/91wUPEbYJrQ9sAHlktEawbHix dwaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9Ft9tXQgPoU/SG9CvZK2TUDKGHqxEj46b1nQVDCP1bk=; b=42TBLaaOm1BzTW60+cbtHVKF1AWltSdFOsdiS/CxSaOp1TM/qMo+9G978j9scydpx8 QVK5r5JWnElGW1GlEn9gOnOBlBnHAchAMypd61zoa6+DkrqTPm5u4HWa+Fl10FLCJHGF p35kLkVv+yrG/BLtgi/zDgOt0CkKknvVi06siWLeaanX2owiYBOTVrV6xShhTZF5576f uK4EiUpItgRU0nylYvx58sBIifM5+nBpTVzXVHeqWpzWLxjlR/MulY8Qqf+4/m85VD8x OQVURaxJ9RHAE21Zz1N224nefzYjFjlgowgr0zuxO328RXwmCnnaNgtEOCWef8qSKs0D hAug== X-Gm-Message-State: AOAM530UmpJHvcvysrgyzGmgu4xcz6fOFHbstfmdrspblTLwT0Gw1j/U AcFODcPZKcuJtae1R43Xk1A2uflQ3bDk0g== X-Google-Smtp-Source: ABdhPJxGuZrpYXVdTzRke1d7Wib0KVRT3h+7QRT1Aswt9CmC24210/UgGnBPkxnX1LC3FX2D0W+Fag== X-Received: by 2002:adf:df84:: with SMTP id z4mr4165497wrl.519.1642521334152; Tue, 18 Jan 2022 07:55:34 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id f15sm1220522wrd.45.2022.01.18.07.55.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jan 2022 07:55:33 -0800 (PST) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , J Smith , Taylor Blau , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH v8 05/10] grep.c: don't pass along NULL callback value Date: Tue, 18 Jan 2022 16:55:17 +0100 Message-Id: X-Mailer: git-send-email 2.35.0.rc1.864.g57621b115b6 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Change grep_cmd_config() to stop passing around the always-NULL "cb" value. When this code was added in 7e8f59d577e (grep: color patterns in output, 2009-03-07) it was non-NULL, but when that changed in 15fabd1bbd4 (builtin/grep.c: make configuration callback more reusable, 2012-10-09) this code was left behind. In a subsequent change I'll start using the "cb" value, this will make it clear which functions we call need it, and which don't. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/grep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/grep.c b/builtin/grep.c index d85cbabea67..5ec4cecae45 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -285,8 +285,8 @@ static int wait_all(void) static int grep_cmd_config(const char *var, const char *value, void *cb) { - int st = grep_config(var, value, cb); - if (git_color_default_config(var, value, cb) < 0) + int st = grep_config(var, value, NULL); + if (git_color_default_config(var, value, NULL) < 0) st = -1; if (!strcmp(var, "grep.threads")) { -- 2.35.0.rc1.864.g57621b115b6