qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Luiz Capitulino <lcapitulino@redhat.com>
To: aliguori@us.ibm.com
Cc: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 18/19] tcx: tcx24_screen_dump(): add error handling
Date: Wed,  5 Sep 2012 15:58:45 -0300	[thread overview]
Message-ID: <1346871526-25342-19-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1346871526-25342-1-git-send-email-lcapitulino@redhat.com>

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 hw/tcx.c | 50 +++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/hw/tcx.c b/hw/tcx.c
index 74a7085..428649e 100644
--- a/hw/tcx.c
+++ b/hw/tcx.c
@@ -611,12 +611,18 @@ static void tcx24_screen_dump(void *opaque, const char *filename, bool cswitch,
     FILE *f;
     uint8_t *d, *d1, v;
     uint32_t *s24, *cptr, dval;
-    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;
     s24 = s->vram24;
     cptr = s->cplane;
@@ -625,20 +631,46 @@ static void tcx24_screen_dump(void *opaque, const char *filename, bool cswitch,
         for(x = 0; x < s->width; x++, d++, s24++) {
             if ((*cptr++ & 0xff000000) == 0x03000000) { // 24-bit direct
                 dval = *s24 & 0x00ffffff;
-                fputc((dval >> 16) & 0xff, f);
-                fputc((dval >> 8) & 0xff, f);
-                fputc(dval & 0xff, f);
+                ret = fputc((dval >> 16) & 0xff, f);
+                if (ret == EOF) {
+                    goto write_err;
+                }
+                ret = fputc((dval >> 8) & 0xff, f);
+                if (ret == EOF) {
+                    goto write_err;
+                }
+                ret = fputc(dval & 0xff, f);
+                if (ret == EOF) {
+                    goto write_err;
+                }
             } else {
                 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;
+                }
             }
         }
         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 Property tcx_properties[] = {
-- 
1.7.11.2.249.g31c7954.dirty

  parent reply	other threads:[~2012-09-05 18:58 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-05 18:58 [Qemu-devel] [PULL 00/19]: QMP queue Luiz Capitulino
2012-09-05 18:58 ` [Qemu-devel] [PATCH 01/19] Add support for pretty-printing response in qmp-shell Luiz Capitulino
2012-09-05 18:58 ` [Qemu-devel] [PATCH 02/19] fix doc of using raw values with sendkey Luiz Capitulino
2012-09-05 18:58 ` [Qemu-devel] [PATCH 03/19] monitor: rename keyname '<' to 'less' Luiz Capitulino
2012-09-05 18:58 ` [Qemu-devel] [PATCH 04/19] hmp: rename arguments Luiz Capitulino
2012-09-05 18:58 ` [Qemu-devel] [PATCH 05/19] qapi: generate list struct and visit_list for enum Luiz Capitulino
2012-09-05 18:58 ` [Qemu-devel] [PATCH 06/19] qapi: add the QKeyCode enum Luiz Capitulino
2012-09-05 18:58 ` [Qemu-devel] [PATCH 07/19] monitor: move key_defs[] table and introduce two help functions Luiz Capitulino
2012-09-05 18:58 ` [Qemu-devel] [PATCH 08/19] qapi: convert sendkey Luiz Capitulino
2012-09-05 18:58 ` [Qemu-devel] [PATCH 09/19] qapi: Fix potential NULL pointer segfault Luiz Capitulino
2012-09-05 18:58 ` [Qemu-devel] [PATCH 10/19] json-parser: " Luiz Capitulino
2012-09-05 18:58 ` [Qemu-devel] [PATCH 11/19] error: add error_setg() Luiz Capitulino
2012-09-05 18:58 ` [Qemu-devel] [PATCH 12/19] console: vga_hw_screen_dump_ptr: take Error argument Luiz Capitulino
2012-09-05 18:58 ` [Qemu-devel] [PATCH 13/19] qapi: convert screendump Luiz Capitulino
2012-09-05 18:58 ` [Qemu-devel] [PATCH 14/19] vga: ppm_save(): add error handling Luiz Capitulino
2012-09-05 18:58 ` [Qemu-devel] [PATCH 15/19] omap_lcdc: rename ppm_save() to omap_ppm_save() Luiz Capitulino
2012-09-05 18:58 ` [Qemu-devel] [PATCH 16/19] omap_lcdc: omap_ppm_save(): add error handling Luiz Capitulino
2012-09-05 18:58 ` [Qemu-devel] [PATCH 17/19] g364fb: g364fb_screen_dump(): " Luiz Capitulino
2012-09-05 18:58 ` Luiz Capitulino [this message]
2012-09-05 18:58 ` [Qemu-devel] [PATCH 19/19] tcx: tcx_screen_dump(): " Luiz Capitulino
2012-09-10 13:18 ` [Qemu-devel] [PULL 00/19]: QMP queue Aurelien Jarno

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1346871526-25342-19-git-send-email-lcapitulino@redhat.com \
    --to=lcapitulino@redhat.com \
    --cc=aliguori@us.ibm.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).