[Spice-devel] [PATCH qxl-win v3] display/*: s/FreeSurface/FreeSurfaceInfo/

Alon Levy alevy at redhat.com
Thu Jul 7 02:43:29 PDT 2011


---
 display/driver.c  |    2 +-
 display/res.c     |    2 +-
 display/surface.h |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/display/driver.c b/display/driver.c
index 09cd21b..11ba875 100644
--- a/display/driver.c
+++ b/display/driver.c
@@ -1283,7 +1283,7 @@ HBITMAP APIENTRY DrvCreateDeviceBitmap(DHPDEV dhpdev, SIZEL size, ULONG format)
 
     // to optimize the failure case
 out_error2:
-    FreeSurface(pdev, surface_id);
+    FreeSurfaceInfo(pdev, surface_id);
 out_error:
     return 0;
 }
diff --git a/display/res.c b/display/res.c
index c8cb1d1..76fc6b7 100644
--- a/display/res.c
+++ b/display/res.c
@@ -805,7 +805,7 @@ static void FreeDelSurface(PDev *pdev, Resource *res)
     default:
         PANIC(pdev, "bad allocation type");
     }
-    FreeSurface(pdev, internal->surface_id);
+    FreeSurfaceInfo(pdev, internal->surface_id);
     FreeMem(pdev, MSPACE_TYPE_DEVRAM, res);
 
     DEBUG_PRINT((pdev, 13, "%s: done\n", __FUNCTION__));
diff --git a/display/surface.h b/display/surface.h
index 608696c..977fa91 100644
--- a/display/surface.h
+++ b/display/surface.h
@@ -30,7 +30,7 @@ static _inline UINT32 GetSurfaceId(SURFOBJ *surf)
     return GetSurfaceIdFromInfo(surface);
 }
 
-static _inline void FreeSurface(PDev *pdev, UINT32 surface_id)
+static _inline void FreeSurfaceInfo(PDev *pdev, UINT32 surface_id)
 {
     SurfaceInfo *surface;
 
-- 
1.7.5.4



More information about the Spice-devel mailing list