summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-06-07 16:23:45 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-07 16:23:45 -0700
commit7a40ac2585028860730ffcd333eb3fe9de63680c (patch)
tree00e065ddb22f48902a0d0cea5ac472a432ef80c3
parent163980138cc0bfc9124456781b3dc45a49e2a129 (diff)
remove a bunch of unused variables in Xprint/Init.c (fixing the compiler warnings)
-rw-r--r--Xprint/Init.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/Xprint/Init.c b/Xprint/Init.c
index 0bc1cf39e..cee9e47cf 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)