frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

This commit is contained in:
Greg Kroah-Hartman 2006-06-07 16:23:45 -07:00
parent 163980138c
commit 7a40ac2585
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Xprint/Init.c
View File

@ -288,10 +288,6 @@ static const char configFilePath[] =
static const char printServerConfigDir[] = "XPSERVERCONFIGDIR"; static const char printServerConfigDir[] = "XPSERVERCONFIGDIR";
static int printScreenPrivIndex,
printWindowPrivIndex,
printGCPrivIndex;
static unsigned long printGeneration = 0;
static char *configFileName = (char *)NULL; static char *configFileName = (char *)NULL;
static Bool freeDefaultFontPath = FALSE; static Bool freeDefaultFontPath = FALSE;
static char *origFontPath = (char *)NULL; static char *origFontPath = (char *)NULL;
@ -806,7 +802,6 @@ GetConfigFileName(void)
static PrinterDbPtr static PrinterDbPtr
BuildPrinterDb(void) BuildPrinterDb(void)
{ {
char *printerList, *augmentCmd = (char *)NULL;
Bool defaultAugment = TRUE, freeConfigFileName; Bool defaultAugment = TRUE, freeConfigFileName;
if(configFileName && access(configFileName, R_OK) != 0) if(configFileName && access(configFileName, R_OK) != 0)
@ -1156,8 +1151,8 @@ AddToFontPath(
static void static void
AugmentFontPath(void) AugmentFontPath(void)
{ {
char *newPath, *modelID, **allIDs = (char **)NULL; char *modelID, **allIDs = (char **)NULL;
PrinterDbPtr pDb, pDbEntry; PrinterDbPtr pDbEntry;
int numModels, i; int numModels, i;
if(!origFontPath) if(!origFontPath)
@ -1649,10 +1644,9 @@ GenericScreenInit(
int argc, int argc,
char **argv) char **argv)
{ {
int i;
float fWidth, fHeight, maxWidth, maxHeight; float fWidth, fHeight, maxWidth, maxHeight;
unsigned short width, height; unsigned short width, height;
PrinterDbPtr pDb, pDb2; PrinterDbPtr pDb;
int res, maxRes; int res, maxRes;
/* /*
@ -1799,7 +1793,7 @@ GetPrinterListInfo(
int localeLen, int localeLen,
char *locale) char *locale)
{ {
PrinterDbPtr pDb, pDb2; PrinterDbPtr pDb;
for(pDb = printerDb; pDb != (PrinterDbPtr)NULL; pDb = pDb->next) for(pDb = printerDb; pDb != (PrinterDbPtr)NULL; pDb = pDb->next)
{ {
@ -1848,7 +1842,7 @@ XpDiGetPrinterList(
if(!nameLen || name == (char *)NULL) if(!nameLen || name == (char *)NULL)
{ {
int i; int i;
PrinterDbPtr pDb, pDb2; PrinterDbPtr pDb;
for(pDb = printerDb, i = 0; pDb != (PrinterDbPtr)NULL; for(pDb = printerDb, i = 0; pDb != (PrinterDbPtr)NULL;
pDb = pDb->next, i++) pDb = pDb->next, i++)
@ -1898,7 +1892,6 @@ WindowPtr
XpDiValidatePrinter(char *printerName, int printerNameLen) XpDiValidatePrinter(char *printerName, int printerNameLen)
{ {
PrinterDbPtr pCurEntry; PrinterDbPtr pCurEntry;
WindowPtr pWin;
for(pCurEntry = printerDb; for(pCurEntry = printerDb;
pCurEntry != (PrinterDbPtr)NULL; pCurEntry = pCurEntry->next) pCurEntry != (PrinterDbPtr)NULL; pCurEntry = pCurEntry->next)