Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1j6ZI1-00041h-C0 for mharc-grub-devel@gnu.org; Tue, 25 Feb 2020 07:26:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55593) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6ZHy-0003uY-N6 for grub-devel@gnu.org; Tue, 25 Feb 2020 07:26:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6ZHv-0006YA-KQ for grub-devel@gnu.org; Tue, 25 Feb 2020 07:26:13 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:24089 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6ZHv-0006Xc-GS for grub-devel@gnu.org; Tue, 25 Feb 2020 07:26:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582633571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MSkQzVI/lewVZuptTNkQ/cCj9Y57g7q+wnRAF0dZdVE=; b=gzXBGDTQsYgbWTjv41sg76y4+1BLBYK+vQZDyn1RRsK7T6pui898+bsMrIliMP5Zr1G0Ou zumhDFwul28VkD0DF7nCoMOSurtG3q/vfZH9GzWZ0gNyAnf/tfjzhOBYdnCEGBWUfLyGo8 M+ipXahbzHVvsO7/t1QKVk6Mnrv4s+k= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-469-Lexdi_fzPtCPa0wfCAx27g-1; Tue, 25 Feb 2020 07:26:08 -0500 X-MC-Unique: Lexdi_fzPtCPa0wfCAx27g-1 Received: by mail-wr1-f72.google.com with SMTP id c6so7196362wrm.18 for ; Tue, 25 Feb 2020 04:26:08 -0800 (PST) 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=nedKDtnTgl1ow45vuha7sEKYtjZnPYoyJBqulzFeUfw=; b=UQXL1DLWribQSJKyRUy11+wxqSsEbHU6vFL2eMBVKZ/JySq6cl5wXZNG/0x8BEeRRS UTpGYVbjnIvtvzsUJjWzWgpMiMMQEJo61pBdo7Gprp/DExrnP4nlcz3wMbgzhq4nZRfu sBzEG9faF5Q7URKP2ksWKWJ7bge/YvWEa3pDAty/G8Ff9ddq1qel+TYZt4BLCTx0Ly8u NkKLwO/lJnpaNgAY0T1v9ycApNSesBVGPpJFWLR9nLETqdN8tEPpFC4WN4nNMp4qSjjj u0NLXzoh1Wg0xZnrxb9hK8E30e1IQ/mKSKOCy0htijvyCxirxhtpL6jy+wRl7PS/VvvX 7qNg== X-Gm-Message-State: APjAAAXHXhBBh07htkj1ZD4Y4hdFq5PkVzWEInv5lVJJf/vOlps08s50 opLMbCdKKufqdg7nHaZSvRdg5Zj9JMAxkxN6eS0+FNN2WVTmkQS8YmT8fAP8eTeGQdM8Fh+IrX8 vCfGeixDMsSE= X-Received: by 2002:a1c:208a:: with SMTP id g132mr4452613wmg.143.1582633567605; Tue, 25 Feb 2020 04:26:07 -0800 (PST) X-Google-Smtp-Source: APXvYqwUXAWgA6iEa+B/tZEvDZua1+Gdn8+oqWTqy2VO94XF6yHndUkuIsYs0LoWTT4kIlifK0mOyw== X-Received: by 2002:a1c:208a:: with SMTP id g132mr4452600wmg.143.1582633567441; Tue, 25 Feb 2020 04:26:07 -0800 (PST) Received: from minerva.redhat.com ([2a01:c50f:ab80:6700:527f:85b3:5615:ff0b]) by smtp.gmail.com with ESMTPSA id q6sm17251653wrf.67.2020.02.25.04.26.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 04:26:06 -0800 (PST) From: Javier Martinez Canillas To: grub-devel@gnu.org Cc: Daniel Kiper , Peter Jones , Javier Martinez Canillas Subject: [PATCH 04/10] kern: Add grub_debug_enabled() Date: Tue, 25 Feb 2020 13:25:47 +0100 Message-Id: <20200225122553.1120216-5-javierm@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200225122553.1120216-1-javierm@redhat.com> References: <20200225122553.1120216-1-javierm@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Feb 2020 12:26:16 -0000 From: Peter Jones Add a grub_debug_enabled() helper function instead of open coding it. Signed-off-by: Peter Jones Signed-off-by: Javier Martinez Canillas --- grub-core/kern/misc.c | 21 ++++++++++++++++----- include/grub/misc.h | 1 + 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c index 76e7fb22872..d205fb1342e 100644 --- a/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c @@ -158,17 +158,28 @@ int grub_err_printf (const char *fmt, ...) __attribute__ ((alias("grub_printf"))); #endif =20 +int +grub_debug_enabled (const char * condition) +{ + const char *debug; + + debug =3D grub_env_get ("debug"); + if (!debug) + return 0; + + if (grub_strword (debug, "all") || grub_strword (debug, condition)) + return 1; + + return 0; +} + void grub_real_dprintf (const char *file, const int line, const char *condition= , =09=09 const char *fmt, ...) { va_list args; - const char *debug =3D grub_env_get ("debug"); - - if (! debug) - return; =20 - if (grub_strword (debug, "all") || grub_strword (debug, condition)) + if (grub_debug_enabled (condition)) { grub_printf ("%s:%d: ", file, line); va_start (args, fmt); diff --git a/include/grub/misc.h b/include/grub/misc.h index ee48eb7a726..585c2a7644c 100644 --- a/include/grub/misc.h +++ b/include/grub/misc.h @@ -322,6 +322,7 @@ grub_puts (const char *s) } =20 int EXPORT_FUNC(grub_puts_) (const char *s); +int EXPORT_FUNC(grub_debug_enabled) (const char *condition); void EXPORT_FUNC(grub_real_dprintf) (const char *file, const int line, const char *condition, --=20 2.24.1