xserver: Branch 'master'

[Keith Packard]

 dbe/dbe.c       |    4 +---
 dbe/dbestruct.h |    4 ----
 2 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 345eb171264325d73ea2c50ba8c692cf589c2a9b
Author: Keith Packard <keithp at keithp.com>
Date:   Sat May 1 01:41:19 2010 -0700

    Remove dbe screen private privates.
    
    Each DBE Screen private structure could have nested privates. Oddly,
    no code ever used them.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Jamey Sharp <jamey at minilop.net>

diff --git a/dbe/dbe.c b/dbe/dbe.c
index b28b3a0..a49a46d 100644
--- a/dbe/dbe.c
+++ b/dbe/dbe.c
@@ -1450,7 +1450,6 @@ DbeResetProc(ExtensionEntry *extEntry)
 	    if (pDbeScreenPriv->ResetProc)
 		(*pDbeScreenPriv->ResetProc)(pScreen);
 
-	    dixFreePrivates(pDbeScreenPriv->devPrivates);
 	    free(pDbeScreenPriv);
 	}
     }
@@ -1589,8 +1588,7 @@ DbeExtensionInit(void)
 
 	pScreen = screenInfo.screens[i];
 
-	if (!(pDbeScreenPriv =
-              (DbeScreenPrivPtr)calloc(1, sizeof(DbeScreenPrivRec))))
+	if (!(pDbeScreenPriv = malloc (sizeof (DbeScreenPrivRec))))
 	{
             /* If we can not alloc a window or screen private,
              * then free any privates that we already alloc'ed and return
diff --git a/dbe/dbestruct.h b/dbe/dbestruct.h
index 002ffbe..ba6b56d 100644
--- a/dbe/dbestruct.h
+++ b/dbe/dbestruct.h
@@ -217,10 +217,6 @@ typedef struct _DbeScreenPrivRec
 		ScreenPtr /*pScreen*/
 );
 
-    /* Device-specific private information.
-     */
-    PrivateRec	*devPrivates;
-
 } DbeScreenPrivRec, *DbeScreenPrivPtr;
 
 #endif /* DBE_STRUCT_H */