From e45de08eecd3bf1109b015b90a1b919f4a2abbd0 Mon Sep 17 00:00:00 2001 From: Gregor Schneider Date: Tue, 25 Aug 2009 00:13:15 +0000 Subject: [PATCH] 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 --- reactos/base/services/tftpd/tftpd.cpp | 4 ++-- reactos/base/services/tftpd/tftpd.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/base/services/tftpd/tftpd.cpp b/reactos/base/services/tftpd/tftpd.cpp index 9642ae66044..69ee07036c1 100644 --- a/reactos/base/services/tftpd/tftpd.cpp +++ b/reactos/base/services/tftpd/tftpd.cpp @@ -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++; diff --git a/reactos/base/services/tftpd/tftpd.h b/reactos/base/services/tftpd/tftpd.h index b75f62a685b..bdbcf942d15 100644 --- a/reactos/base/services/tftpd/tftpd.h +++ b/reactos/base/services/tftpd/tftpd.h @@ -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*);