Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1j9SgV-0003Wp-04 for mharc-grub-devel@gnu.org; Wed, 04 Mar 2020 06:59:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50765) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9SgN-0003GI-P2 for grub-devel@gnu.org; Wed, 04 Mar 2020 06:59:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9SgM-0003CZ-L7 for grub-devel@gnu.org; Wed, 04 Mar 2020 06:59:23 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:59320 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j9SgM-0003CL-Hf for grub-devel@gnu.org; Wed, 04 Mar 2020 06:59:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583323162; 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=oU3k9ITt98JVI55MDEo8stK+dMkQL6np8GHgq5U3WxI=; b=btv6FL1LRD1loBzkTG9RK6yLoGA7GO3eW9DPPdB3+zXZuK2ANCq5jS7ZV1TOX3fb7dxqUC VXKmDobOCFd8dwuvq+q1zdTW+mxb0SKZB4m/3Qp/on0IiItPmH4tcBAFmQg1OaPW8bPoQh XBGjbwvRD4xyjlXTuAHvp/aGI0Scq1c= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-121-qr8h6RVnO6KQhjIyO20Cag-1; Wed, 04 Mar 2020 06:59:20 -0500 X-MC-Unique: qr8h6RVnO6KQhjIyO20Cag-1 Received: by mail-wm1-f71.google.com with SMTP id 7so751548wmo.7 for ; Wed, 04 Mar 2020 03:59:20 -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=dQVlPFJXrmx7vEcJJTrYJfoPlsgeXB+PoK9EElWC7f4=; b=jkKEixAVXuudwm7k9XknFq7RGmpEp95zCku4HB0CxSbio5alD+ZdkFZd7Ns7/fK1iB XuUsy1UEcyVMS5V5nibmgEaH7gy+3/aKFlKXjH9dksZfAOdF2YxvDl0JcxcWfARg6x8G FAoiI42uaWuZkuTLoKUVVaX7jRYNcKRU3A/Ukpzmu+7pmZ5q9TttpVAbGc+ym17Q9BxX hBGbax2nNy9EY+vVlOf/yK/erdIQmz/7nRvUlLx5ySRxwIwepSqhDZNlge69xbuuEWBT JPKwhhzVnChdKRUVZHUEn0l1LPy0nIDXKgqMe6tLSt3fjAYVGNCvxzETdAf1OkAmgkwZ ZQKw== X-Gm-Message-State: ANhLgQ1hmpUJ9jGVdcv9N/jIsCkjAHCAoSsLKznEMTkyrhu0sGx+JZJ1 O62Hm5rye6PAOQHvCitOOk6wzGTw6zAVwZhWeiB78kFHMEXycJjUriKtvULlJbMdl2J51dCa3hT XDJz2b75QNoo= X-Received: by 2002:adf:c445:: with SMTP id a5mr3790050wrg.14.1583323159068; Wed, 04 Mar 2020 03:59:19 -0800 (PST) X-Google-Smtp-Source: ADFU+vtF37kjyklxtpWJkt/7IuYRQ4AGI3MwNHCvl4unZ8dvQ0pBVWsiJoP4J8hcTLQK+80Vcrb5vA== X-Received: by 2002:adf:c445:: with SMTP id a5mr3790038wrg.14.1583323158861; Wed, 04 Mar 2020 03:59:18 -0800 (PST) Received: from minerva.redhat.com ([2a01:c50f:ab80:6700:527f:85b3:5615:ff0b]) by smtp.gmail.com with ESMTPSA id t14sm5911207wrp.63.2020.03.04.03.59.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 03:59:18 -0800 (PST) From: Javier Martinez Canillas To: grub-devel@gnu.org Cc: Daniel Kiper , Peter Jones , Javier Martinez Canillas Subject: [PATCH v2 04/12] kern: Add grub_debug_enabled() Date: Wed, 4 Mar 2020 12:58:43 +0100 Message-Id: <20200304115851.3474263-5-javierm@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200304115851.3474263-1-javierm@redhat.com> References: <20200304115851.3474263-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.81 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: Wed, 04 Mar 2020 11:59:25 -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 Reviewed-by: Daniel Kiper --- 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