From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIHgp-0001v5-IP for qemu-devel@nongnu.org; Fri, 15 Aug 2014 09:37:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XIHgf-00065G-Pt for qemu-devel@nongnu.org; Fri, 15 Aug 2014 09:37:07 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:42477 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIHgf-00064q-Ic for qemu-devel@nongnu.org; Fri, 15 Aug 2014 09:36:57 -0400 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Fri, 15 Aug 2014 15:35:38 +0200 Message-Id: <1408109759-1100-7-git-send-email-benoit.canet@nodalink.com> In-Reply-To: <1408109759-1100-1-git-send-email-benoit.canet@nodalink.com> References: <1408109759-1100-1-git-send-email-benoit.canet@nodalink.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 06/26] monitor: Make monitor_fprintf public before extracting it List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Signed-off-by: Beno=C3=AEt Canet Reviewed-by: Eric Blake --- disas.c | 10 ---------- include/monitor/monitor.h | 2 ++ monitor.c | 4 ++-- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/disas.c b/disas.c index 44a019a..b174f26 100644 --- a/disas.c +++ b/disas.c @@ -435,16 +435,6 @@ monitor_read_memory (bfd_vma memaddr, bfd_byte *myad= dr, int length, return 0; } =20 -static int GCC_FMT_ATTR(2, 3) -monitor_fprintf(FILE *stream, const char *fmt, ...) -{ - va_list ap; - va_start(ap, fmt); - monitor_vprintf((Monitor *)stream, fmt, ap); - va_end(ap); - return 0; -} - /* Disassembler for the monitor. See target_disas for a description of flags. */ void monitor_disas(Monitor *mon, CPUArchState *env, diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index bd9a1f2..0155390 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -77,4 +77,6 @@ void add_completion_option(ReadLineState *rs, const cha= r *str, void monitor_user_noop(Monitor *mon, const QObject *data); int do_qmp_capabilities(Monitor *mon, const QDict *params, QObject **ret= _data); =20 +int GCC_FMT_ATTR(2, 3) monitor_fprintf(FILE *stream, const char *fmt, ..= .); + #endif /* !MONITOR_H */ diff --git a/monitor.c b/monitor.c index 8c90c11..5e73536 100644 --- a/monitor.c +++ b/monitor.c @@ -328,8 +328,8 @@ void monitor_printf(Monitor *mon, const char *fmt, ..= .) va_end(ap); } =20 -static int GCC_FMT_ATTR(2, 3) monitor_fprintf(FILE *stream, - const char *fmt, ...) +int GCC_FMT_ATTR(2, 3) monitor_fprintf(FILE *stream, + const char *fmt, ...) { va_list ap; va_start(ap, fmt); --=20 2.1.0.rc1