xserver: Branch 'master'

[Keith Packard]

 dix/main.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit f028e70ca714f6956e41754f132cb9b8a1e8db63
Author: Keith Packard <keithp at keithp.com>
Date:   Wed Jun 30 08:33:55 2010 -0700

    Initialize dev privates before using any
    
    Initializing the dev privates code after allocating the server client
    dev privates would cause the memory leak check to fire at server
    startup or reset.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Acked-by: Daniel Stone <daniel at fooishbar.org>

diff --git a/dix/main.c b/dix/main.c
index 5c46dc1..47a932f 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -184,6 +184,9 @@ int main(int argc, char *argv[], char *envp[])
 	clients[0] = serverClient;
 	currentMaxClients = 1;
 
+	/* Initialize privates before first allocation */
+	dixResetPrivates();
+
 	/* Initialize server client devPrivates, to be reallocated as
 	 * more client privates are registered
 	 */
@@ -200,7 +203,6 @@ int main(int argc, char *argv[], char *envp[])
 	InitEvents();
 	InitSelections();
 	InitGlyphCaching();
-	dixResetPrivates();
 	dixResetRegistry();
 	ResetFontPrivateIndex();
 	InitCallbackManager();