tftpd: add parenthesis around AND statements embedded in OR statements, use const char* for string constants (gcc 4.4 warnings)

svn path=/trunk/; revision=42931
This commit is contained in:
Gregor Schneider 2009-08-25 00:13:15 +00:00
parent 32f5ad4ca6
commit e45de08eec
2 changed files with 3 additions and 3 deletions

View file

@ -1568,7 +1568,7 @@ void mySplit(char *name, char *value, char *source, char splitChar)
//printf("%s %s\n", name, value);
}
bool getSection(char *sectionName, char *buffer, BYTE serial, char *fileName)
bool getSection(const char *sectionName, char *buffer, BYTE serial, char *fileName)
{
//printf("%s=%s\n",fileName,sectionName);
char section[128];
@ -1598,7 +1598,7 @@ bool getSection(char *sectionName, char *buffer, BYTE serial, char *fileName)
if (strstr(buff, "[") == buff)
break;
if ((*buff) >= '0' && (*buff) <= '9' || (*buff) >= 'A' && (*buff) <= 'Z' || (*buff) >= 'a' && (*buff) <= 'z' || ((*buff) && strchr("/\\?*", (*buff))))
if (((*buff) >= '0' && (*buff) <= '9') || ((*buff) >= 'A' && (*buff) <= 'Z') || ((*buff) >= 'a' && (*buff) <= 'z') || (((*buff) && strchr("/\\?*", (*buff)))))
{
buffer += sprintf(buffer, "%s", buff);
buffer++;

View file

@ -151,7 +151,7 @@ void processRequest(LPVOID lpParam);
char* myGetToken(char*, BYTE);
void init();
bool cleanReq(request*);
bool getSection(char*, char*, BYTE, char*);
bool getSection(const char*, char*, BYTE, char*);
bool isIP(char*s);
char* myLower(char*);
char* myUpper(char*);