[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 8/9] tcx: tcx24_screen_dump(): add error handling
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 8/9] tcx: tcx24_screen_dump(): add error handling |
Date: |
Wed, 29 Aug 2012 16:53:05 -0300 |
Signed-off-by: Luiz Capitulino <address@hidden>
---
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
- [Qemu-devel] [PATCH 1/9] error: add error_setg(), (continued)
- [Qemu-devel] [PATCH 1/9] error: add error_setg(), Luiz Capitulino, 2012/08/29
- [Qemu-devel] [PATCH 2/9] console: vga_hw_screen_dump_ptr: take Error argument, Luiz Capitulino, 2012/08/29
- [Qemu-devel] [PATCH 3/9] qapi: convert screendump, Luiz Capitulino, 2012/08/29
- [Qemu-devel] [PATCH 4/9] vga: ppm_save(): add error handling, Luiz Capitulino, 2012/08/29
- [Qemu-devel] [PATCH 5/9] omap_lcdc: rename ppm_save() to omap_ppm_save(), Luiz Capitulino, 2012/08/29
- [Qemu-devel] [PATCH 6/9] omap_lcdc: omap_ppm_save(): add error handling, Luiz Capitulino, 2012/08/29
- [Qemu-devel] [PATCH 7/9] g364fb: g364fb_screen_dump(): add error handling, Luiz Capitulino, 2012/08/29
- [Qemu-devel] [PATCH 8/9] tcx: tcx24_screen_dump(): add error handling,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 9/9] tcx: tcx_screen_dump(): add error handling, Luiz Capitulino, 2012/08/29