From patchwork Wed Aug 29 19:53:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 180762 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 05F472C00D2 for ; Thu, 30 Aug 2012 06:32:59 +1000 (EST) Received: from localhost ([::1]:59290 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T6oK6-00076P-Nh for incoming@patchwork.ozlabs.org; Wed, 29 Aug 2012 15:53:10 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59272) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T6oJe-0005wU-El for qemu-devel@nongnu.org; Wed, 29 Aug 2012 15:52:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T6oJd-0004OU-DT for qemu-devel@nongnu.org; Wed, 29 Aug 2012 15:52:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61206) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T6oJd-0004OI-3s for qemu-devel@nongnu.org; Wed, 29 Aug 2012 15:52:41 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7TJqeRH024284 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 29 Aug 2012 15:52:40 -0400 Received: from localhost (ovpn-113-104.phx2.redhat.com [10.3.113.104]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q7TJqd2w028593; Wed, 29 Aug 2012 15:52:40 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 29 Aug 2012 16:53:06 -0300 Message-Id: <1346269986-13539-10-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1346269986-13539-1-git-send-email-lcapitulino@redhat.com> References: <1346269986-13539-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: alevy@redhat.com Subject: [Qemu-devel] [PATCH 9/9] tcx: tcx_screen_dump(): add error handling 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 Signed-off-by: Luiz Capitulino --- hw/tcx.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/hw/tcx.c b/hw/tcx.c index 428649e..93994d6 100644 --- a/hw/tcx.c +++ b/hw/tcx.c @@ -582,26 +582,49 @@ static void tcx_screen_dump(void *opaque, const char *filename, bool cswitch, TCXState *s = opaque; FILE *f; uint8_t *d, *d1, v; - int y, x; + int ret, y, x; f = fopen(filename, "wb"); - if (!f) + if (!f) { + error_setg(errp, "failed to open file '%s': %s", filename, + strerror(errno)); return; - fprintf(f, "P6\n%d %d\n%d\n", s->width, s->height, 255); + } + ret = fprintf(f, "P6\n%d %d\n%d\n", s->width, s->height, 255); + if (ret < 0) { + goto write_err; + } d1 = s->vram; for(y = 0; y < s->height; y++) { d = d1; for(x = 0; x < s->width; x++) { v = *d; - fputc(s->r[v], f); - fputc(s->g[v], f); - fputc(s->b[v], f); + ret = fputc(s->r[v], f); + if (ret == EOF) { + goto write_err; + } + ret = fputc(s->g[v], f); + if (ret == EOF) { + goto write_err; + } + ret = fputc(s->b[v], f); + if (ret == EOF) { + goto write_err; + } d++; } d1 += MAXX; } + +out: fclose(f); return; + +write_err: + error_setg(errp, "failed to write to file '%s': %s", filename, + strerror(errno)); + unlink(filename); + goto out; } static void tcx24_screen_dump(void *opaque, const char *filename, bool cswitch,