xserver: Branch 'master' - 2 commits

[Greg Kroah-Hartman]

 Xprint/ps/PsText.c   |    6 +-----
 Xprint/ps/PsWindow.c |    4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

New commits:
diff-tree 35fccb0068e8d73d1e6a16aefdc771506e620f83 (from 1ac30947f4a222ba78558eddf8e5f03cec31f613)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Thu Jun 8 10:40:24 2006 -0700

    remove some compiler warnings in Xprint/ps/PsText.c
    
    Note that one of the existing warnings is pointing out a
    real bug (uninitialized use for fontPage in PsPolyText16())
    if anyone really cares about this code.

diff --git a/Xprint/ps/PsText.c b/Xprint/ps/PsText.c
index 228e407..37463ba 100644
--- a/Xprint/ps/PsText.c
+++ b/Xprint/ps/PsText.c
@@ -329,11 +329,7 @@ PsPolyText16(
     {
         PsOutPtr       psOut;
         ColormapPtr    cMap;
-        unsigned short c,
-                       c_hiByte,
-                       c_lowByte,
-                       fontPage;
-        int            i;
+        unsigned short fontPage;
         
 	if( PsUpdateDrawableGC(pGC, pDrawable, &psOut, &cMap)==FALSE ) 
 	    return x; 
diff-tree 1ac30947f4a222ba78558eddf8e5f03cec31f613 (from 9fa73721f0c3df73e508da909a5665f47a54cb57)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Thu Jun 8 10:35:18 2006 -0700

    fix compiler warnings in Xprint/ps/PsWindow.c

diff --git a/Xprint/ps/PsWindow.c b/Xprint/ps/PsWindow.c
index 313e51f..415e97e 100644
--- a/Xprint/ps/PsWindow.c
+++ b/Xprint/ps/PsWindow.c
@@ -96,6 +96,7 @@ extern WindowPtr *WindowTable;
  * placed on the screen's root window if the property was defined in
  * the start-up configuration resource database.
  */
+#if 0
 static char *propStrings[] = {
 	DT_PRINT_JOB_HEADER,
 	DT_PRINT_JOB_TRAILER,
@@ -107,7 +108,7 @@ static char *propStrings[] = {
 	DT_PRINT_PAGE_COMMAND,
 	(char *)NULL
 };
-
+#endif
 
 /*
  * PsCreateWindow - watch for the creation of the root window.
@@ -222,7 +223,6 @@ PsPaintWindow(
   RegionPtr pRegion,
   int       what)
 {
-  int       status;
   WindowPtr pRoot;
 
 #define FUNCTION        0