[Spice-devel] [xf86-video-qxl] Fix up a few stray warnings from commit 3e37b2c38f

[Jeremy White]

Signed-off-by: Jeremy White <jwhite at codeweavers.com>
---
 src/qxl.h         |    1 +
 src/qxl_surface.c |   11 +++--------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/qxl.h b/src/qxl.h
index a9c3b76..b71bca6 100644
--- a/src/qxl.h
+++ b/src/qxl.h
@@ -423,6 +423,7 @@ surface_cache_t *   qxl_surface_cache_create (qxl_screen_t *qxl);
 qxl_surface_t *	    qxl_surface_cache_create_primary (qxl_screen_t *qxl,
 						struct QXLMode *mode);
 void *              qxl_surface_get_host_bits(qxl_surface_t *surface);
+struct qxl_bo *     qxl_image_from_surface(qxl_screen_t *qxl, qxl_surface_t *dest);
 qxl_surface_t *	    qxl_surface_create (qxl_screen_t *qxl,
 					int	      width,
 					int	      height,
diff --git a/src/qxl_surface.c b/src/qxl_surface.c
index 5e6737a..e8e8539 100644
--- a/src/qxl_surface.c
+++ b/src/qxl_surface.c
@@ -471,10 +471,8 @@ image_from_surface_internal(qxl_screen_t *qxl,
     return image_bo;
 }
 
-struct qxl_bo *image_from_surface(qxl_screen_t *qxl, qxl_surface_t *dest)
+struct qxl_bo *qxl_image_from_surface(qxl_screen_t *qxl, qxl_surface_t *dest)
 {
-    struct QXLImage *image_bo;
-
     if (!dest->image_bo)
       dest->image_bo = image_from_surface_internal(qxl, dest);
 
@@ -520,11 +518,10 @@ qxl_surface_copy (qxl_surface_t *dest,
     else
     {
 	struct qxl_bo *image_bo;
-	struct QXLImage *image;
 
 	dest->u.copy_src->ref_count++;
 
-	image_bo = image_from_surface(qxl, dest->u.copy_src);
+	image_bo = qxl_image_from_surface(qxl, dest->u.copy_src);
 
 	drawable_bo = make_drawable (qxl, dest, QXL_DRAW_COPY, &qrect);
 
@@ -590,14 +587,12 @@ image_from_picture (qxl_screen_t *qxl,
 		    qxl_surface_t *surface,
 		    int *force_opaque)
 {
-    struct qxl_bo *image_bo;
-
     if (picture->format == PICT_x8r8g8b8)
 	*force_opaque = TRUE;
     else
 	*force_opaque = FALSE;
 
-    return image_from_surface(qxl, surface);
+    return qxl_image_from_surface(qxl, surface);
 }
 
 static struct qxl_bo *
-- 
1.7.10.4