tftpd: add parenthesis around AND statements embedded in OR statements, use const...

svn path=/trunk/; revision=42931

diff --git a/reactos/base/services/tftpd/tftpd.cpp b/reactos/base/services/tftpd/tftpd.cpp
index 9642ae6..69ee070 100644 (file)
--- 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 b75f62a..bdbcf94 100644 (file)
--- 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*);