xserver: Branch 'master' - 2 commits

[Peter Hutterer]

 dix/events.c    |   11 ++++++-----
 dix/getevents.c |    2 +-
 dix/main.c      |    1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit a81b5ce452766bbc4b2ac0849711284ba8591b46
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Wed Jun 25 13:23:09 2008 +0930

    dix: free memory associated with the EventList. #16507
    
    Un-deprecates CloseDownEvents.
    
    X.Org Bug 16507 <http://bugs.freedesktop.org/show_bug.cgi?id=16507>

diff --git a/dix/events.c b/dix/events.c
index 7bd6825..f6309f2 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -5520,14 +5520,15 @@ InitEvents(void)
         FatalError("[dix] Failed to allocate input event list.\n");
 }
 
-/**
- * This function is deprecated! It shouldn't be used anymore. It used to free
- * the spriteTraces, but now they are freed when the SpriteRec is freed.
- */
-_X_DEPRECATED void
+void
 CloseDownEvents(void)
 {
+    int len;
+    EventListPtr list;
 
+    len = GetEventList(&list);
+    while(len--)
+        xfree(list[len].event);
 }
 
 /**
diff --git a/dix/main.c b/dix/main.c
index e0bb180..3bc45fb 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -437,6 +437,7 @@ int main(int argc, char *argv[], char *envp[])
 
         memset(WindowTable, 0, MAXSCREENS * sizeof(WindowPtr));
 	CloseDownDevices();
+	CloseDownEvents();
 
 	for (i = screenInfo.numScreens - 1; i >= 0; i--)
 	{
commit 3a2beb2f867fd47dc5a7723dcac345ea0b0ecf3d
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Wed Jun 25 13:12:41 2008 +0930

    dix: InitEventList does not need to be _X_EXPORT.

diff --git a/dix/getevents.c b/dix/getevents.c
index b00bc11..3713f4b 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -787,7 +787,7 @@ GetKeyboardValuatorEvents(EventList *events, DeviceIntPtr pDev, int type,
  *
  * @param num_events Number of elements in list.
  */
-_X_EXPORT EventListPtr
+EventListPtr
 InitEventList(int num_events)
 {
     EventListPtr events;