xserver: Branch 'master' - 2 commits

[Greg Kroah-Hartman]

 Xprint/Init.c       |    8 +++-----
 Xprint/attributes.c |   13 +++++--------
 2 files changed, 8 insertions(+), 13 deletions(-)

New commits:
diff-tree 71dd44b0ad617dd36ce4ed328f9e1e8c5ef713a5 (from 839305bac98856a2bb1d96691e4dcf49db229f90)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Wed Jun 7 19:17:26 2006 -0700

    Fixed up most "warning: function declaration isn't a prototype" warnings from Xprint/

diff --git a/Xprint/Init.c b/Xprint/Init.c
index cee9e47..9fba6c5 100644
--- a/Xprint/Init.c
+++ b/Xprint/Init.c
@@ -378,7 +378,7 @@ PrinterOptions(
     char **argv,
     int i)
 {
-    extern void ddxUseMsg();
+    extern void ddxUseMsg(void);
     if(strcmp(argv[i], "-XpFile") == 0)
     {
 	if ((i + 1) >= argc) {
@@ -693,7 +693,7 @@ StoreDriverNames(void)
  * from the printerDb is store in the attribute store for the printer.
  */
 static void
-StoreDescriptors()
+StoreDescriptors(void)
 {
     PrinterDbPtr pEntry;
 
@@ -1709,9 +1709,7 @@ GenericScreenInit(
  * freeing the associated memory.
  */
 static char *
-QualifyName(fileName, searchPath)
-    char *fileName;
-    char *searchPath;
+QualifyName(char *fileName, char *searchPath)
 {
     char * curPath = searchPath;
     char * nextPath;
diff --git a/Xprint/attributes.c b/Xprint/attributes.c
index 16724e4..8e4c811 100644
--- a/Xprint/attributes.c
+++ b/Xprint/attributes.c
@@ -158,7 +158,7 @@ static char NULL_STRING[] = "\0";
  * where the print server configuration directory is localed.
  */
 static
-char *XpGetConfigDirBase()
+char *XpGetConfigDirBase(void)
 {
     char *configDir;
 
diff-tree 839305bac98856a2bb1d96691e4dcf49db229f90 (from 7a40ac2585028860730ffcd333eb3fe9de63680c)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Wed Jun 7 19:12:23 2006 -0700

    Remove unused variables from Xprint/attributes.c

diff --git a/Xprint/attributes.c b/Xprint/attributes.c
index 60f6803..16724e4 100644
--- a/Xprint/attributes.c
+++ b/Xprint/attributes.c
@@ -342,7 +342,7 @@ BuildPrinterAttrs(
 
     if(systemAttributes.printers != (XrmDatabase)NULL)
     {
-        char *dirName, *fileName;
+        char *fileName;
         XrmDatabase modelDB = (XrmDatabase)NULL;
         XrmName xrm_name[5], xrm_class[2];
         XrmRepresentation rep_type;
@@ -642,7 +642,6 @@ XpGetOneAttribute(
 {
     ContextAttrPtr pCtxtAttrs;
     XrmDatabase db = (XrmDatabase)NULL;
-    char *retVal;
     XrmName xrm_name[3];
     XrmRepresentation rep_type;
     XrmValue value;
@@ -895,7 +894,6 @@ XpGetAttributes(
 {
     ContextAttrPtr pCtxtAttrs;
     XrmDatabase db = (XrmDatabase)NULL;
-    char *retVal;
     StringDbStruct enumStruct;
     XrmQuark empty = NULLQUARK;
 
@@ -1536,8 +1534,8 @@ VectorizeCommand(
     char ***pVector,
     XpContextPtr pContext)
 {
-    char *cmdName, *curTok;
-    int i, numChars;
+    char *cmdName;
+    int numChars;
 
     if(command == (char *)NULL)
 	return (char *)NULL;
@@ -1563,7 +1561,7 @@ XpSubmitJob(fileName, pContext)
      char *fileName;
      XpContextPtr pContext;
 {
-    char **vector, *cmdNam, *cmdOpt, *command, *userName;
+    char **vector, *cmdNam, *command, *userName;
     int i;
 
     command = XpGetOneAttribute(pContext, XPPrinterAttr, "xp-spooler-command");
@@ -1689,7 +1687,6 @@ XpGetTrayMediumFromContext(XpContextPtr 
 {
     char *defMedium, *defTray;
     char *t, *m;
-    char *pS, *pE, *pLast;
     
     defMedium = XpGetOneAttribute( pCon, XPPageAttr, 
 				  "default-medium" );