Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1j9Sgb-0003k0-QQ for mharc-grub-devel@gnu.org; Wed, 04 Mar 2020 06:59:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50838) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9SgU-0003VF-7U for grub-devel@gnu.org; Wed, 04 Mar 2020 06:59:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9SgT-0003Gp-5k for grub-devel@gnu.org; Wed, 04 Mar 2020 06:59:30 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:48750 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 1j9SgT-0003Ga-2I for grub-devel@gnu.org; Wed, 04 Mar 2020 06:59:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583323168; 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=c6VVO8s0pc+EgmTpqd/+3hGknI8UHYAfOcLC89cPPlY=; b=Ir6lG3p/nU2ukue6GyGMG5coBl3ms0nwFJ31e2RSuu6UWsN8RNEqsTwScy7DqSrhbH7dc2 hsq9/ddkldaUEdvErYj9tcSSNgqbr/MsKXwXpUeh3uap/zVTGetKboDU4GuiADUz5KWy2R hZG408nIcPgg0wjWjf7WUpdOwxhu4ys= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-295-x6dYxKVoPt2xDiI166r5Nw-1; Wed, 04 Mar 2020 06:59:27 -0500 X-MC-Unique: x6dYxKVoPt2xDiI166r5Nw-1 Received: by mail-wm1-f70.google.com with SMTP id v21so456167wml.5 for ; Wed, 04 Mar 2020 03:59:27 -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=+zDu4g1YIz/32xGp3+Sf4Mour21KUfereQSECGFtZx0=; b=NxQzCoYTPsemY8IFPMastoQS2w/VE564JjDCCM4wtekvsESVNMLgE91nnfVD1xEB18 YmfvtxrE5can+Zlc0klZgAlkmDLAGu955fLXKsKm8+18K9fF1yD4Zvi9Jt5fhianpDkG gffOntJVAXMoC2nLZGDyRcneJvTOD7j16tfNQ/T4xT2phn3tfPQZFzOiGfsSqjg66Yog 8nqwJkpBfne/FyRiLO7GfvhYjZhr3cP0BiEJS5KDbYbA/FP9/tXgLTwfB4RRCEtfyxQv RO9MuhYH/hJfVeL5B5gFkUPNyOkdyzb9EGjpUSsM7nu+REauRdJuTiLrWHUUihUhRrWD GwRw== X-Gm-Message-State: ANhLgQ0vxIJ8NUKqr3lANhhv4SV9hpQCf0im4HerRsp+cmc09McXnOSs aodvJDxhb0qC3dI0EmXxqzruCsQGeNIg0kIyYC4Y5JBiEUmTC9IRj4tmEqL8/nL57BIxz9v7t7n yycQElNDjijo= X-Received: by 2002:a05:600c:2215:: with SMTP id z21mr3363144wml.124.1583323165833; Wed, 04 Mar 2020 03:59:25 -0800 (PST) X-Google-Smtp-Source: ADFU+vv9MXxnvfcRW3gNLDfcouEI8deut0MANtomJSYVws4km/CDMtRpWuacKG1xjFIO2lPyjz1DcA== X-Received: by 2002:a05:600c:2215:: with SMTP id z21mr3363125wml.124.1583323165642; Wed, 04 Mar 2020 03:59:25 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 03:59:24 -0800 (PST) From: Javier Martinez Canillas To: grub-devel@gnu.org Cc: Daniel Kiper , Peter Jones , Javier Martinez Canillas Subject: [PATCH v2 08/12] kern: Make grub_error() more verbose Date: Wed, 4 Mar 2020 12:58:47 +0100 Message-Id: <20200304115851.3474263-9-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.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: Wed, 04 Mar 2020 11:59:31 -0000 From: Peter Jones Add file and line to grub_error() output to make troubleshooting easier. Signed-off-by: Peter Jones Signed-off-by: Javier Martinez Canillas --- grub-core/kern/err.c | 13 +++++++++++-- include/grub/err.h | 5 ++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/grub-core/kern/err.c b/grub-core/kern/err.c index 53c734de70e..aebfe0cf839 100644 --- a/grub-core/kern/err.c +++ b/grub-core/kern/err.c @@ -33,15 +33,24 @@ static struct grub_error_saved grub_error_stack_items[G= RUB_ERROR_STACK_SIZE]; static int grub_error_stack_pos; static int grub_error_stack_assert; =20 +#ifdef grub_error +#undef grub_error +#endif + grub_err_t -grub_error (grub_err_t n, const char *fmt, ...) +grub_error (grub_err_t n, const char *file, const int line, const char *fm= t, ...) { va_list ap; + int m; =20 grub_errno =3D n; =20 + m =3D grub_snprintf (grub_errmsg, sizeof (grub_errmsg), "%s:%d:", file, = line); + if (m < 0) + m =3D 0; + va_start (ap, fmt); - grub_vsnprintf (grub_errmsg, sizeof (grub_errmsg), _(fmt), ap); + grub_vsnprintf (grub_errmsg + m, sizeof (grub_errmsg) - m, _(fmt), ap); va_end (ap); =20 return n; diff --git a/include/grub/err.h b/include/grub/err.h index 24ba9f5f592..b68bbec3c72 100644 --- a/include/grub/err.h +++ b/include/grub/err.h @@ -85,7 +85,10 @@ struct grub_error_saved extern grub_err_t EXPORT_VAR(grub_errno); extern char EXPORT_VAR(grub_errmsg)[GRUB_MAX_ERRMSG]; =20 -grub_err_t EXPORT_FUNC(grub_error) (grub_err_t n, const char *fmt, ...); +grub_err_t EXPORT_FUNC(grub_error) (grub_err_t n, const char *file, const = int line, const char *fmt, ...); + +#define grub_error(n, fmt, ...) grub_error (n, __FILE__, __LINE__, fmt, ##= __VA_ARGS__) + void EXPORT_FUNC(grub_fatal) (const char *fmt, ...) __attribute__ ((noretu= rn)); void EXPORT_FUNC(grub_error_push) (void); int EXPORT_FUNC(grub_error_pop) (void); --=20 2.24.1