[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 2/4] sm501: Drop unneded variable
From: |
Gerd Hoffmann |
Subject: |
[PULL 2/4] sm501: Drop unneded variable |
Date: |
Mon, 15 Jun 2020 17:14:47 +0200 |
From: BALATON Zoltan <balaton@eik.bme.hu>
We don't need a separate variable to keep track if we allocated memory
that needs to be freed as we can test the pointer itself.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Message-id:
7a818701887a77af17995aa062b37f92ffc3d2eb.1591471056.git.balaton@eik.bme.hu
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/display/sm501.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 5ae320ddc325..85d54b598f80 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -796,13 +796,12 @@ static void sm501_2d_operation(SM501State *s)
de = db + width + height * (width + dst_pitch);
if (rtl && ((db >= sb && db <= se) || (de >= sb && de <= se))) {
/* regions may overlap: copy via temporary */
- int free_buf = 0, llb = width * (1 << format);
+ int llb = width * (1 << format);
int tmp_stride = DIV_ROUND_UP(llb, sizeof(uint32_t));
uint32_t *tmp = tmp_buf;
if (tmp_stride * sizeof(uint32_t) * height > sizeof(tmp_buf)) {
tmp = g_malloc(tmp_stride * sizeof(uint32_t) * height);
- free_buf = 1;
}
pixman_blt((uint32_t *)&s->local_mem[src_base], tmp,
src_pitch * (1 << format) / sizeof(uint32_t),
@@ -813,7 +812,7 @@ static void sm501_2d_operation(SM501State *s)
dst_pitch * (1 << format) / sizeof(uint32_t),
8 * (1 << format), 8 * (1 << format),
0, 0, dst_x, dst_y, width, height);
- if (free_buf) {
+ if (tmp != tmp_buf) {
g_free(tmp);
}
} else {
--
2.18.4
- [PULL 0/4] Vga 20200615 patches, Gerd Hoffmann, 2020/06/15
- [PULL 2/4] sm501: Drop unneded variable,
Gerd Hoffmann <=
- [PULL 3/4] sm501: Ignore no-op blits, Gerd Hoffmann, 2020/06/15
- [PULL 4/4] sm501: Optimise 1 pixel 2d ops, Gerd Hoffmann, 2020/06/15
- [PULL 1/4] sm501: Fix bounds checks, Gerd Hoffmann, 2020/06/15
- Re: [PULL 0/4] Vga 20200615 patches, Peter Maydell, 2020/06/15
- Re: [PULL 0/4] Vga 20200615 patches, BALATON Zoltan, 2020/06/15