From patchwork Fri May 25 19:41:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 161417 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 0E563B6EEC for ; Sat, 26 May 2012 06:28:35 +1000 (EST) Received: from localhost ([::1]:44947 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY0Oj-0007BY-Ey for incoming@patchwork.ozlabs.org; Fri, 25 May 2012 15:42:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY0OB-00061x-7y for qemu-devel@nongnu.org; Fri, 25 May 2012 15:41:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SY0O8-0004V9-NX for qemu-devel@nongnu.org; Fri, 25 May 2012 15:41:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13513) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY0O8-0004Uj-F2 for qemu-devel@nongnu.org; Fri, 25 May 2012 15:41:28 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q4PJfQ4l001130 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 25 May 2012 15:41:27 -0400 Received: from localhost (ovpn-116-69.ams2.redhat.com [10.36.116.69]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q4PJfOmP013006; Fri, 25 May 2012 15:41:26 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 25 May 2012 16:41:11 -0300 Message-Id: <1337974879-3656-7-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.68 on 10.5.11.24 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 06/14] cutils: introduce qemu_fwrite_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 fwrite() wrapper that takes an Error argument. Signed-off-by: Luiz Capitulino --- cutils.c | 15 +++++++++++++++ qemu-common.h | 2 ++ 2 files changed, 17 insertions(+) diff --git a/cutils.c b/cutils.c index 83edb43..63fdfc0 100644 --- a/cutils.c +++ b/cutils.c @@ -634,3 +634,18 @@ int qemu_fputc_err(int c, FILE *stream, Error **errp) return ret; } + +size_t qemu_fwrite_err(const void *ptr, size_t size, size_t nmemb, + FILE *stream, Error **errp) +{ + size_t ret; + + clearerr(stream); + ret = fwrite(ptr, size, nmemb, stream); + + if (ferror(stream)) { + set_write_err(errp, errno); + } + + return ret; +} diff --git a/qemu-common.h b/qemu-common.h index 895bc2b..39377ff 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -212,6 +212,8 @@ 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, ...); int qemu_fputc_err(int c, FILE *stream, Error **errp); +size_t qemu_fwrite_err(const void *ptr, size_t size, size_t nmemb, + FILE *stream, Error **errp); /* Error handling. */