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 D315D1F5AE for ; Thu, 17 Jun 2021 10:09:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231926AbhFQKLw (ORCPT ); Thu, 17 Jun 2021 06:11:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231229AbhFQKLt (ORCPT ); Thu, 17 Jun 2021 06:11:49 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BF4DC06175F for ; Thu, 17 Jun 2021 03:09:41 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id o39-20020a05600c5127b02901d23584fd9bso3175750wms.0 for ; Thu, 17 Jun 2021 03:09:41 -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=KbPqMrR/hMx47v3v/4q7U3+/YESVSEx64u3P8grbBLg=; b=M5IruwNu/HqLOF6Cl3wIIKftK/YIBjCrQAK6QWmeD24rRz9Ko5RDwbo2z1oQbfFP8t HwQRUua4lI7+U9QWq6RE4D/XM8bqnmw13ynzJyOC4sZ3zVXNbP0ZoLzx3HWpSUblCemq ghooB/dipw22H9Yh1Y4A6Q95/fpQuVpGn3ojfSCvHCAOEBx2CmmBYaclysu9AQzceEIW q7FCrv7Flv1upEoxNl8p3klaPSXCJLZGd4CbUWlyeJJCFVevYHdTuk2AVD7cbsWZJaK+ dv7bugRSjBc7CVcbJJZyxjb94dQLF3DaDRLyjIlOLAAHlrDmyIrD94FBs7K4OVxQLxxo jRPA== 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=KbPqMrR/hMx47v3v/4q7U3+/YESVSEx64u3P8grbBLg=; b=jMRVEtD/PiTckCbv3YIcrBVRGHtjHclLb/i0DsRj+CnCJb96azPRLX0AwDsow+nPOw IGDignlVq60rd5CmlHWUh4GYVOw1+f8yKFCVsE85vIiAenXKYMT03zHizR1rmhw9SXGR zaqDPR20BGDOBxmfiWvNOuvPUbZacSxslDK7Yxn/unRDMiyCLXz7oU7LBYjxGSEQDn7K XmEP2IlwI/dYewmBpgPG6XkhN/haJKkUOb1LiP45x/6BgdAPQwE7tbkxAESVo4KPGy14 wh51XAW3qpdQnddiHn7XygUAkUL9ayc6vzO2FUxHAXZ1a4bDUnVkcWUGvf0QjNjgt9vR JfEQ== X-Gm-Message-State: AOAM531NwkmvVaeYrb/EwhftQ2KlVRvHXN8jpe1dTM1TvFEp27DWaMtQ uhHoThmu6WmFOdHIQ+AfxnPneDuwqzk/fg== X-Google-Smtp-Source: ABdhPJyjBDY6l/iUkG720iGoh5bZ2htMblVNE/aBGWJWKUD9W/O3ozhzRqmmHQmNv8eHOdnlWA9K7w== X-Received: by 2002:a7b:c1ce:: with SMTP id a14mr4173492wmj.180.1623924580098; Thu, 17 Jun 2021 03:09:40 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id h9sm7348425wmm.33.2021.06.17.03.09.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 03:09:39 -0700 (PDT) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , Emily Shaffer , Jeff Hostetler , Johannes Schindelin , Felipe Contreras , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH 2/3] hook.c: add a hook_exists() wrapper and use it in bugreport.c Date: Thu, 17 Jun 2021 12:09:35 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.576.g59759b6ca7d 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 From: Emily Shaffer Add a boolean version of the find_hook() function for those callers who are only interested in checking whether the hook exists, not what the path to it is. Signed-off-by: Emily Shaffer Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/bugreport.c | 2 +- hook.c | 5 +++++ hook.h | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/builtin/bugreport.c b/builtin/bugreport.c index 596f079a7f..941c8d5e27 100644 --- a/builtin/bugreport.c +++ b/builtin/bugreport.c @@ -82,7 +82,7 @@ static void get_populated_hooks(struct strbuf *hook_info, int nongit) } for (i = 0; i < ARRAY_SIZE(hook); i++) - if (find_hook(hook[i])) + if (hook_exists(hook[i])) strbuf_addf(hook_info, "%s\n", hook[i]); } diff --git a/hook.c b/hook.c index c4dbef1d0e..97cd799a32 100644 --- a/hook.c +++ b/hook.c @@ -35,3 +35,8 @@ const char *find_hook(const char *name) } return path.buf; } + +int hook_exists(const char *name) +{ + return !!find_hook(name); +} diff --git a/hook.h b/hook.h index 68624f1605..4c547ac15e 100644 --- a/hook.h +++ b/hook.h @@ -8,4 +8,9 @@ */ const char *find_hook(const char *name); +/* + * A boolean version of find_hook() + */ +int hook_exists(const char *hookname); + #endif -- 2.32.0.576.g59759b6ca7d