From: Luiz Capitulino <lcapitulino@redhat.com>
To: qemu-devel@nongnu.org
Cc: alevy@redhat.com
Subject: [Qemu-devel] [PATCH 9/9] tcx: tcx_screen_dump(): add error handling
Date: Wed, 29 Aug 2012 16:53:06 -0300 [thread overview]
Message-ID: <1346269986-13539-10-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1346269986-13539-1-git-send-email-lcapitulino@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
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,
--
1.7.11.2.249.g31c7954.dirty
prev parent reply other threads:[~2012-08-29 19:52 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-29 19:52 [Qemu-devel] [PATCH qmp-next v3 0/9]: qapi: convert screendump Luiz Capitulino
2012-08-29 19:52 ` [Qemu-devel] [PATCH 1/9] error: add error_setg() Luiz Capitulino
2012-08-29 19:52 ` [Qemu-devel] [PATCH 2/9] console: vga_hw_screen_dump_ptr: take Error argument Luiz Capitulino
2012-08-29 19:53 ` [Qemu-devel] [PATCH 3/9] qapi: convert screendump Luiz Capitulino
2012-08-29 19:53 ` [Qemu-devel] [PATCH 4/9] vga: ppm_save(): add error handling Luiz Capitulino
2012-08-29 19:53 ` [Qemu-devel] [PATCH 5/9] omap_lcdc: rename ppm_save() to omap_ppm_save() Luiz Capitulino
2012-08-29 21:26 ` Peter Maydell
2012-08-29 19:53 ` [Qemu-devel] [PATCH 6/9] omap_lcdc: omap_ppm_save(): add error handling Luiz Capitulino
2012-08-29 21:28 ` Peter Maydell
2012-08-30 11:38 ` Luiz Capitulino
2012-08-29 19:53 ` [Qemu-devel] [PATCH 7/9] g364fb: g364fb_screen_dump(): " Luiz Capitulino
2012-08-29 19:53 ` [Qemu-devel] [PATCH 8/9] tcx: tcx24_screen_dump(): " Luiz Capitulino
2012-08-29 19:53 ` Luiz Capitulino [this message]
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=1346269986-13539-10-git-send-email-lcapitulino@redhat.com \
--to=lcapitulino@redhat.com \
--cc=alevy@redhat.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).