From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34853) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fv35D-0007si-Oj for qemu-devel@nongnu.org; Wed, 29 Aug 2018 12:12:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fv35A-0004UH-AN for qemu-devel@nongnu.org; Wed, 29 Aug 2018 12:12:39 -0400 From: Markus Armbruster References: <20180828123346.17548-1-cohuck@redhat.com> <20180828123346.17548-3-cohuck@redhat.com> Date: Wed, 29 Aug 2018 18:12:32 +0200 In-Reply-To: <20180828123346.17548-3-cohuck@redhat.com> (Cornelia Huck's message of "Tue, 28 Aug 2018 14:33:45 +0200") Message-ID: <877ek9883z.fsf@dusky.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 2/3] qemu-error: make use of {error, warn}_report_once_cond List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cornelia Huck Cc: Halil Pasic , qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Peter Xu Cornelia Huck writes: > {error,warn}_report_once() are a special case of the new functions > and can simply switch to them. > > Signed-off-by: Cornelia Huck > --- > include/qemu/error-report.h | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/include/qemu/error-report.h b/include/qemu/error-report.h > index d2a6515e68..4e4c0e757c 100644 > --- a/include/qemu/error-report.h > +++ b/include/qemu/error-report.h > @@ -58,10 +58,7 @@ void warn_report_once_cond(bool *printed, const char *= fmt, ...) > static bool print_once_; \ > bool ret_print_once_ =3D !print_once_; \ > \ > - if (!print_once_) { \ > - print_once_ =3D true; \ > - error_report(fmt, ##__VA_ARGS__); \ > - } \ > + error_report_once_cond(&print_once_, fmt, ##__VA_ARGS__); \ > unlikely(ret_print_once_); \ > }) >=20=20 > @@ -74,10 +71,7 @@ void warn_report_once_cond(bool *printed, const char *= fmt, ...) > static bool print_once_; \ > bool ret_print_once_ =3D !print_once_; \ > \ > - if (!print_once_) { \ > - print_once_ =3D true; \ > - warn_report(fmt, ##__VA_ARGS__); \ > - } \ > + warn_report_once_cond(&print_once_, fmt, ##__VA_ARGS__); \ > unlikely(ret_print_once_); \ > }) Hmm. The macros return a value, while the functions do not. Doesn't this contradict the commit message's claim the macros are =C3=A4 special ca= se of the new functions"? If you make the functions return the value, too, the macros become simpler. Moving complexity from macros to functions feels like a good deal, even when it's just a little bit of complexity like here.