summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-01-25 11:22:38 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2012-01-25 11:23:22 +0000
commita2e83c6dcba1e911f42a3004b3d0782049e243e2 (patch)
tree4caa9bce1fce2d4a04a96a6e524a0a3cf31d5de0
parent8d22a76506133e0f76424159c0944d29bdf39da9 (diff)
sna: Silence compiler warning for a potential uninitialised return on error
sna_accel.c: In function 'sna_copy_plane': sna_accel.c:5022:21: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_accel.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index ee1f373a..deb39bf6 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -5019,7 +5019,7 @@ sna_copy_plane(DrawablePtr src, DrawablePtr dst, GCPtr gc,
{
PixmapPtr pixmap = get_drawable_pixmap(dst);
struct sna *sna = to_sna_from_pixmap(pixmap);
- RegionRec region, *ret;
+ RegionRec region, *ret = NULL;
struct sna_damage **damage;
DBG(("%s: src=(%d, %d), dst=(%d, %d), size=%dx%d\n", __FUNCTION__,
@@ -5105,7 +5105,6 @@ sna_copy_plane(DrawablePtr src, DrawablePtr dst, GCPtr gc,
fallback:
DBG(("%s: fallback\n", __FUNCTION__));
- ret = NULL;
if (!sna_gc_move_to_cpu(gc, dst))
goto out;
if (!sna_drawable_move_region_to_cpu(dst, &region,