xserver: Branch 'master' - 4 commits

[Greg Kroah-Hartman]

 .gitignore            |    3 +++
 Xprint/Init.c         |   17 +++++------------
 Xprint/Oid.c          |    2 --
 hw/dmx/dmxextension.c |    3 ---
 include/dix.h         |    3 +++
 5 files changed, 11 insertions(+), 17 deletions(-)

New commits:
diff-tree 7a40ac2585028860730ffcd333eb3fe9de63680c (from 163980138cc0bfc9124456781b3dc45a49e2a129)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Wed Jun 7 16:23:45 2006 -0700

    remove a bunch of unused variables in Xprint/Init.c (fixing the compiler warnings)

diff --git a/Xprint/Init.c b/Xprint/Init.c
index 0bc1cf3..cee9e47 100644
--- a/Xprint/Init.c
+++ b/Xprint/Init.c
@@ -288,10 +288,6 @@ static const char configFilePath[] =
 
 static const char printServerConfigDir[] = "XPSERVERCONFIGDIR";
 
-static int printScreenPrivIndex,
-	   printWindowPrivIndex,
-	   printGCPrivIndex;
-static unsigned long printGeneration = 0;
 static char *configFileName = (char *)NULL;
 static Bool freeDefaultFontPath = FALSE;
 static char *origFontPath = (char *)NULL;
@@ -806,7 +802,6 @@ GetConfigFileName(void)
 static PrinterDbPtr
 BuildPrinterDb(void)
 {
-    char *printerList, *augmentCmd = (char *)NULL;
     Bool defaultAugment = TRUE, freeConfigFileName;
 
     if(configFileName && access(configFileName, R_OK) != 0)
@@ -1156,8 +1151,8 @@ AddToFontPath(
 static void
 AugmentFontPath(void)
 {
-    char *newPath, *modelID, **allIDs = (char **)NULL;
-    PrinterDbPtr pDb, pDbEntry;
+    char *modelID, **allIDs = (char **)NULL;
+    PrinterDbPtr pDbEntry;
     int numModels, i;
 
     if(!origFontPath)
@@ -1649,10 +1644,9 @@ GenericScreenInit(
      int argc,
      char **argv)
 {
-    int i;
     float fWidth, fHeight, maxWidth, maxHeight;
     unsigned short width, height;
-    PrinterDbPtr pDb, pDb2;
+    PrinterDbPtr pDb;
     int res, maxRes;
     
     /*
@@ -1799,7 +1793,7 @@ GetPrinterListInfo(
     int localeLen,
     char *locale)
 {
-    PrinterDbPtr pDb, pDb2;
+    PrinterDbPtr pDb;
 
     for(pDb = printerDb; pDb != (PrinterDbPtr)NULL; pDb = pDb->next)
     {
@@ -1848,7 +1842,7 @@ XpDiGetPrinterList(
     if(!nameLen || name == (char *)NULL)
     {
 	int i;
-        PrinterDbPtr pDb, pDb2;
+        PrinterDbPtr pDb;
 
         for(pDb = printerDb, i = 0; pDb != (PrinterDbPtr)NULL; 
 	    pDb = pDb->next, i++)
@@ -1898,7 +1892,6 @@ WindowPtr
 XpDiValidatePrinter(char *printerName, int printerNameLen)
 {
     PrinterDbPtr pCurEntry;
-    WindowPtr pWin;
 
     for(pCurEntry = printerDb;
 	pCurEntry != (PrinterDbPtr)NULL; pCurEntry = pCurEntry->next)
diff-tree 163980138cc0bfc9124456781b3dc45a49e2a129 (from 8e41640db884a4633b598d0a52b269e6547c8bf0)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Wed Jun 7 16:11:20 2006 -0700

    remove some unused local variables in Xprint/Oid.c

diff --git a/Xprint/Oid.c b/Xprint/Oid.c
index 7cb1230..e4dadd5 100644
--- a/Xprint/Oid.c
+++ b/Xprint/Oid.c
@@ -1655,8 +1655,6 @@ TrayMediumListValidate(XpOidTrayMediumLi
 		       const XpOidMediumSS* msss)
 {
     int i_mss, i_ds, i_itm;
-    XpOidMediumDiscreteSizeList* ds_list;
-    int tray_count;
     XpOid current_tray, current_medium;
     XpOidMediumDiscreteSizeList* unspecified_tray_ds;
     XpOidMediumDiscreteSizeList* tray_ds;
diff-tree 8e41640db884a4633b598d0a52b269e6547c8bf0 (from 78f4ab6b89fca3086b9c9471b40c11c23fbb6142)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Wed Jun 7 15:56:43 2006 -0700

    add bison generated files to .gitignore

diff --git a/.gitignore b/.gitignore
index b939655..0c144dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,6 @@ include/xkb-config.h
 include/xorg-config.h
 include/xorg-server.h
 include/xwin-config.h
+hw/dmx/config/parser.c
+hw/dmx/config/parser.h
+hw/dmx/config/scanner.c
diff-tree 78f4ab6b89fca3086b9c9471b40c11c23fbb6142 (from 757f40fca50a99377e437949ee77b983c8cd6087)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Wed Jun 7 14:12:40 2006 -0700

    Fix compiler warning about undefined ReinitializeRootWindow function

diff --git a/hw/dmx/dmxextension.c b/hw/dmx/dmxextension.c
index 24f7969..efcaca4 100644
--- a/hw/dmx/dmxextension.c
+++ b/hw/dmx/dmxextension.c
@@ -374,9 +374,6 @@ void dmxUpdateScreenResources(ScreenPtr 
 #ifdef PANORAMIX
 #include "panoramiXsrv.h"
 
-/* Defined in dix/events.c */
-extern void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff);
-
 /** Change the "screen" window attributes by resizing the actual window
  *  on the back-end display (if necessary). */
 static void dmxConfigureScreenWindow(int idx,
diff --git a/include/dix.h b/include/dix.h
index 9fc5b07..7a4f49d 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -694,6 +694,9 @@ extern int TryClientEvents(
 
 extern void WindowsRestructured(void);
 
+#ifdef PANORAMIX
+extern void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff);
+#endif
 
 #ifdef RANDR
 void