From patchwork Fri May 25 19:41:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 161420 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8973BB6EE7 for ; Sat, 26 May 2012 06:31:13 +1000 (EST) Received: from localhost ([::1]:44028 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY0OT-0006hw-PT for incoming@patchwork.ozlabs.org; Fri, 25 May 2012 15:41:49 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53111) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY0Nz-0005Pt-Q6 for qemu-devel@nongnu.org; Fri, 25 May 2012 15:41:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SY0Nx-0004Ko-VJ for qemu-devel@nongnu.org; Fri, 25 May 2012 15:41:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30386) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY0Nx-0004IB-DQ for qemu-devel@nongnu.org; Fri, 25 May 2012 15:41:17 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q4PJfF82026155 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 25 May 2012 15:41:16 -0400 Received: from localhost (ovpn-116-69.ams2.redhat.com [10.36.116.69]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q4PJfDuR009933; Fri, 25 May 2012 15:41:15 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 25 May 2012 16:41:09 -0300 Message-Id: <1337974879-3656-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1337974879-3656-1-git-send-email-lcapitulino@redhat.com> References: <1337974879-3656-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, alevy@redhat.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 04/14] cutils: introduce qemu_fprintf_err() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org A fprintf() wrapper that takes an Error argument. Signed-off-by: Luiz Capitulino --- cutils.c | 31 +++++++++++++++++++++++++++++++ qemu-common.h | 1 + 2 files changed, 32 insertions(+) diff --git a/cutils.c b/cutils.c index bdee130..f5b02b4 100644 --- a/cutils.c +++ b/cutils.c @@ -591,3 +591,34 @@ FILE *qemu_fopen_err(const char *path, const char *mode, Error **errp) return fp; } + +static void set_write_err(Error **errp, int err_nr) +{ + switch (err_nr) { + case ENOSPC: + error_set(errp, QERR_NO_SPACE); + return; + case EFBIG: + error_set(errp, QERR_FILE_TOO_BIG); + return; + default: + error_set(errp, QERR_IO_ERROR); + return; + } +} + +int qemu_fprintf_err(Error **errp, FILE *stream, const char *format, ...) +{ + va_list ap; + int ret; + + va_start(ap, format); + ret = vfprintf(stream, format, ap); + va_end(ap); + + if (ret < 0) { + set_write_err(errp, errno); + } + + return ret; +} diff --git a/qemu-common.h b/qemu-common.h index 2cab2a8..58c5197 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -210,6 +210,7 @@ int qemu_recvv(int sockfd, struct iovec *iov, int len, int iov_offset); int qemu_sendv(int sockfd, struct iovec *iov, int len, int iov_offset); FILE *qemu_fopen_err(const char *path, const char *mode, Error **errp); +int qemu_fprintf_err(Error **errp, FILE *stream, const char *format, ...); /* Error handling. */