xserver: Branch 'master' - 3 commits

[Eamon Walsh]

 Xext/xace.c    |    3 ---
 dix/dixutils.c |    2 +-
 dix/privates.c |    2 ++
 3 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 39cb782f28be4efb2621fd8c614f2367eb834412
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Thu Jan 3 23:16:06 2008 -0500

    XACE: DeleteCallbackList zeroes out its argument so don't do it twice.

diff --git a/Xext/xace.c b/Xext/xace.c
index 6a7df31..e85a517 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -262,10 +262,7 @@ XaceResetProc(ExtensionEntry *extEntry)
     int i;
 
     for (i=0; i<XACE_NUM_HOOKS; i++)
-    {
 	DeleteCallbackList(&XaceHooks[i]);
-	XaceHooks[i] = NULL;
-    }
 } /* XaceResetProc */
 
 
commit 7f376f23db463a65176de632ca6094acb55db951
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Thu Jan 3 23:08:49 2008 -0500

    devPrivates rework: Free callback lists after use.

diff --git a/dix/privates.c b/dix/privates.c
index e04da41..47a0e1a 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -232,6 +232,8 @@ dixResetPrivates(void)
     /* reset internal structures */
     while (items) {
 	next = items->next;
+	DeleteCallbackList(&items->initfuncs);
+	DeleteCallbackList(&items->deletefuncs);
 	xfree(items);
 	items = next;
     }
commit de18703d2a25999e391d11b4c82ee018fb87372d
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Thu Jan 3 23:07:24 2008 -0500

    dix: Fix bug+leak in callback manager DeleteCallbackList function.

diff --git a/dix/dixutils.c b/dix/dixutils.c
index 786f4e3..dd485d5 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -800,7 +800,7 @@ _DeleteCallbackList(
 
     for (i = 0; i < numCallbackListsToCleanup; i++)
     {
-	if ((listsToCleanup[i] = pcbl) != 0)
+	if (listsToCleanup[i] == pcbl)
 	{
 	    listsToCleanup[i] = NULL;
 	    break;