Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NkLcT-0002EB-4S for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:05:57 -0500 Received: from [199.232.76.173] (port=52974 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NkLcS-0002Dn-3K for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:05:56 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NkLcF-0000SK-BZ for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:05:55 -0500 Received: from mx20.gnu.org ([199.232.41.8]:5318) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NkLcC-0000RA-Rl for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:05:41 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NkLcB-00017i-9u for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:05:39 -0500 Received: from blackfin.pond.sub.org (pD9E38C12.dip.t-dialin.net [217.227.140.18]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 692842E2AFD for ; Wed, 24 Feb 2010 18:56:03 +0100 (CET) From: Markus Armbruster Date: Wed, 24 Feb 2010 18:55:24 +0100 Message-Id: <1267034160-3517-13-git-send-email-armbru@redhat.com> In-Reply-To: <1267034160-3517-1-git-send-email-armbru@redhat.com> References: <1267034160-3517-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH RFC 12/48] error: New error_printf() and error_vprintf() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org FIXME They should return int, so callers can calculate width. Signed-off-by: Markus Armbruster --- qemu-error.c | 49 ++++++++++++++++++++++++++++++++++++++++++------- qemu-error.h | 14 ++++++++++++++ 2 files changed, 56 insertions(+), 7 deletions(-) diff --git a/qemu-error.c b/qemu-error.c index 63bcdcf..76c660a 100644 --- a/qemu-error.c +++ b/qemu-error.c @@ -1,18 +1,53 @@ +/* + * Error reporting + * + * Copyright (C) 2010 Red Hat Inc. + * + * Authors: + * Markus Armbruster , + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + #include #include "monitor.h" #include "sysemu.h" -void qemu_error(const char *fmt, ...) +/* + * Print to current monitor if we have one, else to stderr. + * FIXME should return int, so callers can calculate width, but that + * requires surgery to monitor_printf(). Left for another day. + */ +void error_vprintf(const char *fmt, va_list ap) { - va_list args; - - va_start(args, fmt); if (cur_mon) { - monitor_vprintf(cur_mon, fmt, args); + monitor_vprintf(cur_mon, fmt, ap); } else { - vfprintf(stderr, fmt, args); + vfprintf(stderr, fmt, ap); } - va_end(args); +} + +/* + * Print to current monitor if we have one, else to stderr. + * FIXME just like error_vprintf() + */ +void error_printf(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + error_vprintf(fmt, ap); + va_end(ap); +} + +void qemu_error(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + error_vprintf(fmt, ap); + va_end(ap); } void qemu_error_internal(const char *file, int linenr, const char *func, diff --git a/qemu-error.h b/qemu-error.h index fa16113..d90f1da 100644 --- a/qemu-error.h +++ b/qemu-error.h @@ -1,6 +1,20 @@ +/* + * Error reporting + * + * Copyright (C) 2010 Red Hat Inc. + * + * Authors: + * Markus Armbruster , + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + #ifndef QEMU_ERROR_H #define QEMU_ERROR_H +void error_vprintf(const char *fmt, va_list ap); +void error_printf(const char *fmt, ...) __attribute__ ((format(printf, 1, 2))); void qemu_error(const char *fmt, ...) __attribute__ ((format(printf, 1, 2))); void qemu_error_internal(const char *file, int linenr, const char *func, const char *fmt, ...) -- 1.6.6