tyler.durden
/
kernel
mirror of https://github.com/FDOS/kernel.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use strcaseequal instead of strcasecmp since we never care about order 

anyway.


git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@957 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Bart Oldeman 2004-05-24 18:06:04 +00:00
parent 195614981a
commit c0f1c45d1f
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
kernel/config.c
View File

@ -225,7 +225,7 @@ STATIC int SkipLine(char *pLine);
#if 0
STATIC char * stristr(char *s1, char *s2);
#endif
STATIC int strcasecmp(const char * d, const char * s);
STATIC char strcaseequal(const char * d, const char * s);
STATIC int LoadCountryInfoHardCoded(char *filename, COUNT ctryCode, COUNT codePage);
STATIC void umb_init(void);
@ -665,9 +665,7 @@ VOID DoConfig(int nPass)
if (*pLine == '\n' || *pLine == EOF) /* end of line */
break;
if (*pLine == '\r') /* ignore */
;
else
if (*pLine != '\r') /* ignore CR */
pLine++;
}
@ -724,13 +722,8 @@ VOID DoConfig(int nPass)
STATIC struct table * LookUp(struct table *p, BYTE * token)
{
while (*(p->entry) != '\0')
{
if (strcasecmp(p->entry, token) == 0)
break;
else
++p;
}
while (p->entry[0] != '\0' && !strcaseequal(p->entry, token))
++p;
return p;
}
@ -1293,7 +1286,7 @@ STATIC VOID CfgBreak(BYTE * pLine)
{
/* Format: BREAK = (ON | OFF) */
GetStringArg(pLine, szBuf);
break_ena = strcasecmp(szBuf, "OFF") ? 1 : 0;
break_ena = strcaseequal(szBuf, "OFF") ? 0 : 1;
}
STATIC VOID Numlock(BYTE * pLine)
@ -1304,7 +1297,7 @@ STATIC VOID Numlock(BYTE * pLine)
GetStringArg(pLine, szBuf);
*keyflags &= ~32;
*keyflags |= strcasecmp(szBuf, "OFF") ? 32 : 0;
if (!strcaseequal(szBuf, "OFF")) *keyflags |= 32;
keycheck();
}
@ -1651,16 +1644,13 @@ char *strcat(register char * d, register const char * s)
}
/* compare two ASCII strings ignoring case */
STATIC int strcasecmp(const char * d, const char * s)
STATIC char strcaseequal(const char * d, const char * s)
{
int ret;
for (;; s++, d++)
{
ret = toupper(*d) - toupper(*s);
if (ret != 0 || *d == '\0')
break;
}
return ret;
char ch;
while ((ch = toupper(*s++)) == toupper(*d++))
if (ch == '\0')
return 1;
return 0;
}
/*