diff --git a/glide3x/cvg/glide3/src/g3df.c b/glide3x/cvg/glide3/src/g3df.c index b8bcc1f..cc45d58 100644 --- a/glide3x/cvg/glide3/src/g3df.c +++ b/glide3x/cvg/glide3/src/g3df.c @@ -83,7 +83,6 @@ */ #include #include -#include #include <3dfx.h> #define FX_DLL_DEFINITION @@ -408,7 +407,8 @@ GR_DIENTRY(gu3dfGetInfo, FxBool, { char *tempStr = (char*)color_format; while (*tempStr != '\0') { - *tempStr = toupper(*tempStr); + if (*tempStr >= 'a' && *tempStr <= 'z') + *tempStr -= ('a'-'A'); tempStr++; } } diff --git a/glide3x/cvg/init/parse.c b/glide3x/cvg/init/parse.c index 2f8fe4d..ed4f60e 100644 --- a/glide3x/cvg/init/parse.c +++ b/glide3x/cvg/init/parse.c @@ -26,7 +26,6 @@ #include #include #include -#include #if __WIN32__ #include @@ -82,7 +81,7 @@ FX_ENTRY FxBool FX_CALL sst1InitVoodooFile() #ifndef DIRECTX int inCfg, inDac; - FILE *file = (FILE *) NULL; + FILE *file = NULL; char buffer[1024], filename[256]; int helper = (getenv(("SSTV2_DEBUGDAC"))) ? 1 : 0; @@ -232,7 +231,7 @@ FX_ENTRY FxBool FX_CALL sst1InitVoodooFile() inCfg = inDac = 0; while(sst1InitFgets(buffer, file)) { - buffer[strlen(buffer)-1] = (char) NULL; + buffer[strlen(buffer)-1] = 0; if(!strcmp(buffer, "[VOODOO2]")) { inCfg = 1; inDac = 0; continue; @@ -362,7 +361,7 @@ static void foo(int argc, char **argv) inCfg = inDac = 0; while(sst1InitFgets(buffer, file)) { - buffer[strlen(buffer)-1] = (char) NULL; + buffer[strlen(buffer)-1] = 0; if(!strcmp(buffer, "[CFG]")) { inCfg = 1; inDac = 0; continue; @@ -439,7 +438,7 @@ static void sst1InitFixFilename(char *dst, char *src) *dst++ = *src; src++; } - *dst = (char) NULL; + *dst = 0; } #endif @@ -453,13 +452,23 @@ static int sst1InitFgets(char *string, FILE *stream) *ptr++ = (char) charRead; validChars++; if(charRead == '\n') { - *ptr++ = (char) NULL; + *ptr++ = 0; break; } } return(validChars); } +static __inline int sst1_isspace (int c) +{ + switch(c) { + case ' ': case '\t': + case '\n': case '\r': + case '\f': case '\v': return 1; + } + return 0; +} + static int sst1InitFgetc(FILE *stream) { static int column = 0; @@ -494,11 +503,13 @@ static int sst1InitFgetc(FILE *stream) } else continue; } else { - if(isspace(charRead)) + if(sst1_isspace(charRead)) continue; validChars++; column++; - charReadL = (islower(charRead)) ? toupper(charRead) : charRead; + charReadL = charRead; + if (charReadL >= 'a' && charReadL <= 'z') + charReadL -= ('a'-'A'); return(charReadL); } } @@ -512,7 +523,7 @@ static int sst1InitParseFieldCfg(char *string) if((envName = strtok(string, "=")) == NULL) return(0); - if((envVal = strtok((char *) NULL, "=")) == NULL) + if((envVal = strtok(NULL, "=")) == NULL) /* Valid environment variable, NULL value */ return(1); @@ -520,25 +531,23 @@ static int sst1InitParseFieldCfg(char *string) sst1InitToLower(envName); sst1InitToLower(envVal); - if(envVarsBase == (sst1InitEnvVarStruct *) NULL) { - if((envVarsPtr = malloc(sizeof(sst1InitEnvVarStruct))) == - (sst1InitEnvVarStruct *) NULL) + if(envVarsBase == NULL) { + if((envVarsPtr = malloc(sizeof(sst1InitEnvVarStruct))) == NULL) return(0); envVarsBase = envVarsPtr; } else { envVarsPtr = envVarsBase; while(1) { - if(envVarsPtr->nextVar == (sst1InitEnvVarStruct *) NULL) + if(envVarsPtr->nextVar == NULL) break; else envVarsPtr = envVarsPtr->nextVar; } - if((envVarsPtr->nextVar = malloc(sizeof(sst1InitEnvVarStruct))) == - (sst1InitEnvVarStruct *) NULL) + if((envVarsPtr->nextVar = malloc(sizeof(sst1InitEnvVarStruct))) == NULL) return(0); envVarsPtr = envVarsPtr->nextVar; } - envVarsPtr->nextVar = (sst1InitEnvVarStruct *) NULL; + envVarsPtr->nextVar = NULL; strcpy(envVarsPtr->envVariable, envName); strcpy(envVarsPtr->envValue, envVal); @@ -549,64 +558,62 @@ static int sst1InitParseFieldCfg(char *string) static int sst1InitParseFieldDac(char *string) { char *dacFieldReference, *dacFieldValue; - static sst1InitDacStruct *dacPtr = (sst1InitDacStruct *) NULL; + static sst1InitDacStruct *dacPtr = NULL; if((dacFieldReference = strtok(string, "=")) == NULL) return(0); if(!strcmp(dacFieldReference, "MANUFACTURER")) { /* Add new dac device */ - if(dacStructBase == (sst1InitDacStruct *) NULL) { - if((dacPtr = malloc(sizeof(sst1InitDacStruct))) == - (sst1InitDacStruct *) NULL) + if(dacStructBase == NULL) { + if((dacPtr = malloc(sizeof(sst1InitDacStruct))) == NULL) return(0); dacStructBase = dacPtr; } else { dacPtr = dacStructBase; while(1) { - if(dacPtr->nextDac == (sst1InitDacStruct *) NULL) + if(dacPtr->nextDac == NULL) break; else dacPtr = dacPtr->nextDac; } - if((dacPtr->nextDac = malloc(sizeof(sst1InitDacStruct))) == - (sst1InitDacStruct *) NULL) + if((dacPtr->nextDac = malloc(sizeof(sst1InitDacStruct))) == NULL) return(0); dacPtr = dacPtr->nextDac; } - dacPtr->nextDac = (sst1InitDacStruct *) NULL; - dacPtr->dacManufacturer[0] = (char) NULL; - dacPtr->dacDevice[0] = (char) NULL; - dacPtr->detect = (sst1InitDacRdWrStruct *) NULL; - dacPtr->setVideo = (sst1InitDacSetVideoStruct *) NULL; - dacPtr->setMemClk = (sst1InitDacSetMemClkStruct *) NULL; - dacPtr->setVideoMode = (sst1InitDacSetVideoModeStruct *) NULL; + dacPtr->nextDac = NULL; + dacPtr->dacManufacturer[0] = 0; + dacPtr->dacDevice[0] = 0; + dacPtr->detect = NULL; + dacPtr->setVideo = NULL; + dacPtr->setMemClk = NULL; + dacPtr->setVideoMode = NULL; if((dacFieldValue = strtok((char *) NULL, "=")) == NULL) return(0); strcpy(dacPtr->dacManufacturer, dacFieldValue); } else if(!strcmp(dacFieldReference, "DEVICE")) { - if((dacFieldValue = strtok((char *) NULL, "=")) == NULL) + if((dacFieldValue = strtok(NULL, "=")) == NULL) return(0); strcpy(dacPtr->dacDevice, dacFieldValue); } else if(!strcmp(dacFieldReference, "DETECT")) { - if((dacFieldValue = strtok((char *) NULL, "=")) == NULL) + if((dacFieldValue = strtok(NULL, "=")) == NULL) return(0); sst1InitToLower(dacFieldValue); if(!sst1InitParseDacRdWrString(dacFieldValue, dacPtr)) return(0); } else if(!strcmp(dacFieldReference, "SETVIDEO")) { - if((dacFieldValue = strtok((char *) NULL, "=")) == NULL) + if((dacFieldValue = strtok(NULL, "=")) == NULL) return(0); sst1InitToLower(dacFieldValue); if(!sst1InitParseSetVideoString(dacFieldValue, dacPtr)) return(0); } else if(!strcmp(dacFieldReference, "SETMEMCLK")) { - if((dacFieldValue = strtok((char *) NULL, "=")) == NULL) + if((dacFieldValue = strtok(NULL, "=")) == NULL) return(0); sst1InitToLower(dacFieldValue); if(!sst1InitParseSetMemClkString(dacFieldValue, dacPtr)) return(0); } else if(!strcmp(dacFieldReference, "SETVIDEOMODE")) { - if((dacFieldValue = strtok((char *) NULL, "=")) == NULL) + if((dacFieldValue = strtok(NULL, "=")) == NULL) return(0); sst1InitToLower(dacFieldValue); if(!sst1InitParseSetVideoModeString(dacFieldValue, dacPtr)) @@ -646,7 +653,7 @@ static int sst1InitParseDacRdWrString(char *string, sst1InitDacStruct *dacBase) dacRdWrPtr = dacRdWrPtr->nextRdWr; } - dacRdWrPtr->nextRdWr = (sst1InitDacRdWrStruct *) NULL; + dacRdWrPtr->nextRdWr = NULL; if(!sst1InitParseDacRdWr(dacRdWrCmd, dacRdWrPtr)) return(0); cntr++; @@ -663,16 +670,16 @@ static int sst1InitParseDacRdWr(char *string, sst1InitDacRdWrStruct *dacRdWrPtr) strcpy(stringCpy, string); if(stringCpy[5] == '(') { - stringCpy[5] = (char) NULL; + stringCpy[5] = 0; addrDataCmd = &stringCpy[6]; } else if(stringCpy[7] == '(') { - stringCpy[7] = (char) NULL; + stringCpy[7] = 0; addrDataCmd = &stringCpy[8]; } else if(stringCpy[8] == '(') { - stringCpy[8] = (char) NULL; + stringCpy[8] = 0; addrDataCmd = &stringCpy[9]; } else if(stringCpy[9] == '(') { - stringCpy[9] = (char) NULL; + stringCpy[9] = 0; addrDataCmd = &stringCpy[10]; } else return(0); @@ -701,7 +708,7 @@ static int sst1InitParseDacRdWr(char *string, sst1InitDacRdWrStruct *dacRdWrPtr) return(0); if(data[strlen(data)-1] != ')') return(0); - data[strlen(data)-1] = (char) NULL; + data[strlen(data)-1] = 0; dacRdWrPtr->type = DACRDWR_TYPE_WRMOD_POP; if (SSCANF(addr, "%i", &i1) != 1) return(0); @@ -721,7 +728,7 @@ static int sst1InitParseDacRdWr(char *string, sst1InitDacRdWrStruct *dacRdWrPtr) return(0); if(data[strlen(data)-1] != ')') return(0); - data[strlen(data)-1] = (char) NULL; + data[strlen(data)-1] = 0; dacRdWrPtr->type = DACRDWR_TYPE_RDMODWR; if (SSCANF(addr, "%i", &i1) != 1) return(0); @@ -746,7 +753,7 @@ static int sst1InitParseDacRdWr(char *string, sst1InitDacRdWrStruct *dacRdWrPtr) return(0); if(data[strlen(data)-1] != ')') return(0); - data[strlen(data)-1] = (char) NULL; + data[strlen(data)-1] = 0; if (SSCANF(addr, "%i", &i1) != 1) return(0); if (SSCANF(data, "%i", &i2) != 1) @@ -829,7 +836,7 @@ static int sst1InitParseSetVideoString(char *string, sst1InitDacStruct *dacBase) return(0); dacSetVideoPtr = dacSetVideoPtr->nextSetVideo; } - dacSetVideoPtr->nextSetVideo = (sst1InitDacSetVideoStruct *) NULL; + dacSetVideoPtr->nextSetVideo = NULL; /* Width */ if (SSCANF(dacRdWrCmd, "%i", &dacSetVideoPtr->width) != 1) return(0); @@ -867,7 +874,7 @@ static int sst1InitParseSetVideoString(char *string, sst1InitDacStruct *dacBase) return(0); dacRdWrPtr = dacRdWrPtr->nextRdWr; } - dacRdWrPtr->nextRdWr = (sst1InitDacRdWrStruct *) NULL; + dacRdWrPtr->nextRdWr = NULL; if(!sst1InitParseDacRdWr(dacRdWrCmd, dacRdWrPtr)) return(0); cntr++; @@ -907,8 +914,7 @@ static int sst1InitParseSetMemClkString(char *string, return(0); dacSetMemClkPtr = dacSetMemClkPtr->nextSetMemClk; } - dacSetMemClkPtr->nextSetMemClk = (sst1InitDacSetMemClkStruct *) - NULL; + dacSetMemClkPtr->nextSetMemClk = NULL; /* Frequency */ if (SSCANF(dacRdWrCmd, "%i", &dacSetMemClkPtr->frequency) != 1) return(0); @@ -932,7 +938,7 @@ static int sst1InitParseSetMemClkString(char *string, return(0); dacRdWrPtr = dacRdWrPtr->nextRdWr; } - dacRdWrPtr->nextRdWr = (sst1InitDacRdWrStruct *) NULL; + dacRdWrPtr->nextRdWr = NULL; if(!sst1InitParseDacRdWr(dacRdWrCmd, dacRdWrPtr)) return(0); cntr++; @@ -972,8 +978,7 @@ static int sst1InitParseSetVideoModeString(char *string, return(0); dacSetVideoModePtr = dacSetVideoModePtr->nextSetVideoMode; } - dacSetVideoModePtr->nextSetVideoMode = - (sst1InitDacSetVideoModeStruct *) NULL; + dacSetVideoModePtr->nextSetVideoMode = NULL; /* video16BPP */ if (SSCANF(dacRdWrCmd, "%i", &dacSetVideoModePtr->video16BPP) != 1) return(0); @@ -997,7 +1002,7 @@ static int sst1InitParseSetVideoModeString(char *string, return(0); dacRdWrPtr = dacRdWrPtr->nextRdWr; } - dacRdWrPtr->nextRdWr = (sst1InitDacRdWrStruct *) NULL; + dacRdWrPtr->nextRdWr = NULL; if(!sst1InitParseDacRdWr(dacRdWrCmd, dacRdWrPtr)) return(0); cntr++; @@ -1011,7 +1016,8 @@ static void sst1InitToLower(char *string) char *ptr = string; while(*ptr) { - *ptr = (isupper(*ptr)) ? tolower(*ptr) : *ptr; + if (*ptr >= 'A' && *ptr <= 'Z') + *ptr += ('a'-'A'); ptr++; } } diff --git a/glide3x/h3/glide3/src/g3df.c b/glide3x/h3/glide3/src/g3df.c index 4bbfc62..9d23ab1 100644 --- a/glide3x/h3/glide3/src/g3df.c +++ b/glide3x/h3/glide3/src/g3df.c @@ -85,7 +85,6 @@ */ #include #include -#include #include <3dfx.h> #define FX_DLL_DEFINITION @@ -413,7 +412,8 @@ GR_DIENTRY(gu3dfGetInfo, FxBool, { char *tempStr = (char*)color_format; while (*tempStr != '\0') { - *tempStr = toupper(*tempStr); + if (*tempStr >= 'a' && *tempStr <= 'z') + *tempStr -= ('a'-'A'); tempStr++; } } diff --git a/glide3x/h5/glide3/src/g3df.c b/glide3x/h5/glide3/src/g3df.c index ea53e44..e623a39 100644 --- a/glide3x/h5/glide3/src/g3df.c +++ b/glide3x/h5/glide3/src/g3df.c @@ -101,7 +101,6 @@ #include #include #include -#include #include <3dfx.h> #define FX_DLL_DEFINITION @@ -515,7 +514,8 @@ GR_DIENTRY(gu3dfGetInfo, FxBool, { char *tempStr = (char*)color_format; while (*tempStr != '\0') { - *tempStr = toupper(*tempStr); + if (*tempStr >= 'a' && *tempStr <= 'z') + *tempStr -= ('a'-'A'); tempStr++; } } diff --git a/glide3x/sst1/glide3/src/g3df.c b/glide3x/sst1/glide3/src/g3df.c index 69460e2..b1fe9b4 100644 --- a/glide3x/sst1/glide3/src/g3df.c +++ b/glide3x/sst1/glide3/src/g3df.c @@ -88,7 +88,6 @@ */ #include #include -#include #include <3dfx.h> #define FX_DLL_DEFINITION @@ -314,7 +313,8 @@ GR_DIENTRY(gu3dfGetInfo, FxBool, { char *tempStr = (char*)color_format; while (*tempStr != '\0') { - *tempStr = toupper(*tempStr); + if (*tempStr >= 'a' && *tempStr <= 'z') + *tempStr -= ('a'-'A'); tempStr++; } } diff --git a/glide3x/sst1/init/initvg/parse.c b/glide3x/sst1/init/initvg/parse.c index 08e34e4..291604d 100644 --- a/glide3x/sst1/init/initvg/parse.c +++ b/glide3x/sst1/init/initvg/parse.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include <3dfx.h> #define FX_DLL_DEFINITION @@ -75,7 +74,7 @@ FX_ENTRY FxBool FX_CALL sst1InitVoodooFile() #else char filename[256], fixedFilename[512], *tmpPtr; char path[512]; - FILE *file = (FILE *) NULL; + FILE *file = NULL; char buffer[1024]; int inCfg, inDac; int i; @@ -116,12 +115,12 @@ FX_ENTRY FxBool FX_CALL sst1InitVoodooFile() break; } } - if(file == (FILE *) NULL) + if(file == NULL) return(FXFALSE); inCfg = inDac = 0; while(sst1InitFgets(buffer, file)) { - buffer[strlen(buffer)-1] = (char) NULL; + buffer[strlen(buffer)-1] = 0; if(!strcmp(buffer, "[CFG]")) { inCfg = 1; inDac = 0; continue; @@ -244,7 +243,7 @@ void main(int argc, char **argv) inCfg = inDac = 0; while(sst1InitFgets(buffer, file)) { - buffer[strlen(buffer)-1] = (char) NULL; + buffer[strlen(buffer)-1] = 0; if(!strcmp(buffer, "[CFG]")) { inCfg = 1; inDac = 0; continue; @@ -321,7 +320,7 @@ static void sst1InitFixFilename(char *dst, char *src) *dst++ = *src; src++; } - *dst = (char) NULL; + *dst = 0; } #endif @@ -335,13 +334,23 @@ static int sst1InitFgets(char *string, FILE *stream) *ptr++ = (char) charRead; validChars++; if(charRead == '\n') { - *ptr++ = (char) NULL; + *ptr++ = 0; break; } } return(validChars); } +static __inline int sst1_isspace (int c) +{ + switch(c) { + case ' ': case '\t': + case '\n': case '\r': + case '\f': case '\v': return 1; + } + return 0; +} + static int sst1InitFgetc(FILE *stream) { static int column = 0; @@ -376,11 +385,13 @@ static int sst1InitFgetc(FILE *stream) } else continue; } else { - if(isspace(charRead)) + if(sst1_isspace(charRead)) continue; validChars++; column++; - charReadL = (islower(charRead)) ? toupper(charRead) : charRead; + charReadL = charRead; + if (charReadL >= 'a' && charReadL <= 'z') + charReadL -= ('a'-'A'); return(charReadL); } } @@ -394,30 +405,28 @@ static int sst1InitParseFieldCfg(char *string) if((envName = strtok(string, "=")) == NULL) return(0); - if((envVal = strtok((char *) NULL, "=")) == NULL) + if((envVal = strtok(NULL, "=")) == NULL) /* Valid environment variable, NULL value */ return(1); sst1InitToLower(envVal); - if(envVarsBase == (sst1InitEnvVarStruct *) NULL) { - if((envVarsPtr = malloc(sizeof(sst1InitEnvVarStruct))) == - (sst1InitEnvVarStruct *) NULL) + if(envVarsBase == NULL) { + if((envVarsPtr = malloc(sizeof(sst1InitEnvVarStruct))) == NULL) return(0); envVarsBase = envVarsPtr; } else { envVarsPtr = envVarsBase; while(1) { - if(envVarsPtr->nextVar == (sst1InitEnvVarStruct *) NULL) + if(envVarsPtr->nextVar == NULL) break; else envVarsPtr = envVarsPtr->nextVar; } - if((envVarsPtr->nextVar = malloc(sizeof(sst1InitEnvVarStruct))) == - (sst1InitEnvVarStruct *) NULL) + if((envVarsPtr->nextVar = malloc(sizeof(sst1InitEnvVarStruct))) == NULL) return(0); envVarsPtr = envVarsPtr->nextVar; } - envVarsPtr->nextVar = (sst1InitEnvVarStruct *) NULL; + envVarsPtr->nextVar = NULL; strcpy(envVarsPtr->envVariable, envName); strcpy(envVarsPtr->envValue, envVal); @@ -428,64 +437,62 @@ static int sst1InitParseFieldCfg(char *string) static int sst1InitParseFieldDac(char *string) { char *dacFieldReference, *dacFieldValue; - static sst1InitDacStruct *dacPtr = (sst1InitDacStruct *) NULL; + static sst1InitDacStruct *dacPtr = NULL; if((dacFieldReference = strtok(string, "=")) == NULL) return(0); if(!strcmp(dacFieldReference, "MANUFACTURER")) { /* Add new dac device */ - if(dacStructBase == (sst1InitDacStruct *) NULL) { - if((dacPtr = malloc(sizeof(sst1InitDacStruct))) == - (sst1InitDacStruct *) NULL) + if(dacStructBase == NULL) { + if((dacPtr = malloc(sizeof(sst1InitDacStruct))) == NULL) return(0); dacStructBase = dacPtr; } else { dacPtr = dacStructBase; while(1) { - if(dacPtr->nextDac == (sst1InitDacStruct *) NULL) + if(dacPtr->nextDac == NULL) break; else dacPtr = dacPtr->nextDac; } - if((dacPtr->nextDac = malloc(sizeof(sst1InitDacStruct))) == - (sst1InitDacStruct *) NULL) + if((dacPtr->nextDac = malloc(sizeof(sst1InitDacStruct))) == NULL) return(0); dacPtr = dacPtr->nextDac; } - dacPtr->nextDac = (sst1InitDacStruct *) NULL; - dacPtr->dacManufacturer[0] = (char) NULL; - dacPtr->dacDevice[0] = (char) NULL; - dacPtr->detect = (sst1InitDacRdWrStruct *) NULL; - dacPtr->setVideo = (sst1InitDacSetVideoStruct *) NULL; - dacPtr->setMemClk = (sst1InitDacSetMemClkStruct *) NULL; - dacPtr->setVideoMode = (sst1InitDacSetVideoModeStruct *) NULL; - if((dacFieldValue = strtok((char *) NULL, "=")) == NULL) + dacPtr->nextDac = NULL; + dacPtr->dacManufacturer[0] = 0; + dacPtr->dacDevice[0] = 0; + dacPtr->detect = NULL; + dacPtr->setVideo = NULL; + dacPtr->setMemClk = NULL; + dacPtr->setVideoMode = NULL; + if((dacFieldValue = strtok(NULL, "=")) == NULL) return(0); strcpy(dacPtr->dacManufacturer, dacFieldValue); } else if(!strcmp(dacFieldReference, "DEVICE")) { - if((dacFieldValue = strtok((char *) NULL, "=")) == NULL) + if((dacFieldValue = strtok(NULL, "=")) == NULL) return(0); strcpy(dacPtr->dacDevice, dacFieldValue); } else if(!strcmp(dacFieldReference, "DETECT")) { - if((dacFieldValue = strtok((char *) NULL, "=")) == NULL) + if((dacFieldValue = strtok(NULL, "=")) == NULL) return(0); sst1InitToLower(dacFieldValue); if(!sst1InitParseDacRdWrString(dacFieldValue, dacPtr)) return(0); } else if(!strcmp(dacFieldReference, "SETVIDEO")) { - if((dacFieldValue = strtok((char *) NULL, "=")) == NULL) + if((dacFieldValue = strtok(NULL, "=")) == NULL) return(0); sst1InitToLower(dacFieldValue); if(!sst1InitParseSetVideoString(dacFieldValue, dacPtr)) return(0); } else if(!strcmp(dacFieldReference, "SETMEMCLK")) { - if((dacFieldValue = strtok((char *) NULL, "=")) == NULL) + if((dacFieldValue = strtok(NULL, "=")) == NULL) return(0); sst1InitToLower(dacFieldValue); if(!sst1InitParseSetMemClkString(dacFieldValue, dacPtr)) return(0); } else if(!strcmp(dacFieldReference, "SETVIDEOMODE")) { - if((dacFieldValue = strtok((char *) NULL, "=")) == NULL) + if((dacFieldValue = strtok(NULL, "=")) == NULL) return(0); sst1InitToLower(dacFieldValue); if(!sst1InitParseSetVideoModeString(dacFieldValue, dacPtr)) @@ -525,7 +532,7 @@ static int sst1InitParseDacRdWrString(char *string, sst1InitDacStruct *dacBase) dacRdWrPtr = dacRdWrPtr->nextRdWr; } - dacRdWrPtr->nextRdWr = (sst1InitDacRdWrStruct *) NULL; + dacRdWrPtr->nextRdWr = NULL; if(!sst1InitParseDacRdWr(dacRdWrCmd, dacRdWrPtr)) return(0); cntr++; @@ -542,16 +549,16 @@ static int sst1InitParseDacRdWr(char *string, sst1InitDacRdWrStruct *dacRdWrPtr) strcpy(stringCpy, string); if(stringCpy[5] == '(') { - stringCpy[5] = (char) NULL; + stringCpy[5] = 0; addrDataCmd = &stringCpy[6]; } else if(stringCpy[7] == '(') { - stringCpy[7] = (char) NULL; + stringCpy[7] = 0; addrDataCmd = &stringCpy[8]; } else if(stringCpy[8] == '(') { - stringCpy[8] = (char) NULL; + stringCpy[8] = 0; addrDataCmd = &stringCpy[9]; } else if(stringCpy[9] == '(') { - stringCpy[9] = (char) NULL; + stringCpy[9] = 0; addrDataCmd = &stringCpy[10]; } else return(0); @@ -580,7 +587,7 @@ static int sst1InitParseDacRdWr(char *string, sst1InitDacRdWrStruct *dacRdWrPtr) return(0); if(data[strlen(data)-1] != ')') return(0); - data[strlen(data)-1] = (char) NULL; + data[strlen(data)-1] = 0; dacRdWrPtr->type = DACRDWR_TYPE_WRMOD_POP; if (SSCANF(addr, "%i", &i1) != 1) return(0); @@ -600,7 +607,7 @@ static int sst1InitParseDacRdWr(char *string, sst1InitDacRdWrStruct *dacRdWrPtr) return(0); if(data[strlen(data)-1] != ')') return(0); - data[strlen(data)-1] = (char) NULL; + data[strlen(data)-1] = 0; dacRdWrPtr->type = DACRDWR_TYPE_RDMODWR; if (SSCANF(addr, "%i", &i1) != 1) return(0); @@ -625,7 +632,7 @@ static int sst1InitParseDacRdWr(char *string, sst1InitDacRdWrStruct *dacRdWrPtr) return(0); if(data[strlen(data)-1] != ')') return(0); - data[strlen(data)-1] = (char) NULL; + data[strlen(data)-1] = 0; if (SSCANF(addr, "%i", &i1) != 1) return(0); if (SSCANF(data, "%i", &i2) != 1) @@ -650,6 +657,7 @@ static int sst1InitParseDacRdWr(char *string, sst1InitDacRdWrStruct *dacRdWrPtr) return(1); } +#if TEST static void sst1InitPrintDacRdWr(sst1InitDacRdWrStruct *dacRdWrBase, char *prefix) { @@ -674,6 +682,7 @@ static void sst1InitPrintDacRdWr(sst1InitDacRdWrStruct *dacRdWrBase, dacRdWrPtr = dacRdWrPtr->nextRdWr; } } +#endif /* TEST */ static int sst1InitParseSetVideoString(char *string, sst1InitDacStruct *dacBase) { @@ -706,7 +715,7 @@ static int sst1InitParseSetVideoString(char *string, sst1InitDacStruct *dacBase) return(0); dacSetVideoPtr = dacSetVideoPtr->nextSetVideo; } - dacSetVideoPtr->nextSetVideo = (sst1InitDacSetVideoStruct *) NULL; + dacSetVideoPtr->nextSetVideo = NULL; /* Width */ if (SSCANF(dacRdWrCmd, "%i", &dacSetVideoPtr->width) != 1) return(0); @@ -744,7 +753,7 @@ static int sst1InitParseSetVideoString(char *string, sst1InitDacStruct *dacBase) return(0); dacRdWrPtr = dacRdWrPtr->nextRdWr; } - dacRdWrPtr->nextRdWr = (sst1InitDacRdWrStruct *) NULL; + dacRdWrPtr->nextRdWr = NULL; if(!sst1InitParseDacRdWr(dacRdWrCmd, dacRdWrPtr)) return(0); cntr++; @@ -784,8 +793,7 @@ static int sst1InitParseSetMemClkString(char *string, return(0); dacSetMemClkPtr = dacSetMemClkPtr->nextSetMemClk; } - dacSetMemClkPtr->nextSetMemClk = (sst1InitDacSetMemClkStruct *) - NULL; + dacSetMemClkPtr->nextSetMemClk = NULL; /* Frequency */ if (SSCANF(dacRdWrCmd, "%i", &dacSetMemClkPtr->frequency) != 1) return(0); @@ -809,7 +817,7 @@ static int sst1InitParseSetMemClkString(char *string, return(0); dacRdWrPtr = dacRdWrPtr->nextRdWr; } - dacRdWrPtr->nextRdWr = (sst1InitDacRdWrStruct *) NULL; + dacRdWrPtr->nextRdWr = NULL; if(!sst1InitParseDacRdWr(dacRdWrCmd, dacRdWrPtr)) return(0); cntr++; @@ -849,8 +857,7 @@ static int sst1InitParseSetVideoModeString(char *string, return(0); dacSetVideoModePtr = dacSetVideoModePtr->nextSetVideoMode; } - dacSetVideoModePtr->nextSetVideoMode = - (sst1InitDacSetVideoModeStruct *) NULL; + dacSetVideoModePtr->nextSetVideoMode = NULL; /* video16BPP */ if (SSCANF(dacRdWrCmd, "%i", &dacSetVideoModePtr->video16BPP) != 1) return(0); @@ -874,7 +881,7 @@ static int sst1InitParseSetVideoModeString(char *string, return(0); dacRdWrPtr = dacRdWrPtr->nextRdWr; } - dacRdWrPtr->nextRdWr = (sst1InitDacRdWrStruct *) NULL; + dacRdWrPtr->nextRdWr = NULL; if(!sst1InitParseDacRdWr(dacRdWrCmd, dacRdWrPtr)) return(0); cntr++; @@ -888,7 +895,8 @@ static void sst1InitToLower(char *string) char *ptr = string; while(*ptr) { - *ptr = (isupper(*ptr)) ? tolower(*ptr) : *ptr; + if (*ptr >= 'A' && *ptr <= 'Z') + *ptr += ('a'-'A'); ptr++; } } @@ -907,7 +915,7 @@ static void sst1InitToLower(char *string) FX_ENTRY char * FX_CALL sst1InitGetenv(char *string) { sst1InitEnvVarStruct *envVarsPtr; - char *retVal = (char *) NULL; + char *retVal = NULL; /* Does the real environment variable exist? */ if(myGetenv(string))