replace 'SUCCESS' and 'FAIL' macro to 'FFFTP_SUCCESS' and 'FFFTP_FAIL' to suppress...

[ffftp/ffftp.git] / wildcard.c

diff --git a/wildcard.c b/wildcard.c
index daa2026..42aeb70 100644 (file)
--- a/wildcard.c
+++ b/wildcard.c
@@ -51,7 +51,7 @@ static int CheckNameMatch(char *str, char *regexp);
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *\r
 *      Note\r
 *              VAX VMSの時は ; 以降は無視する\r
@@ -84,14 +84,14 @@ int CheckFname(char *str, char *regexp)
        if((strcmp(p1, "*.*") == 0) || (strcmp(p1, "????????.???") == 0))\r
                strcpy(p1, "*");\r
 \r
-       Sts = SUCCESS;\r
+       Sts = FFFTP_SUCCESS;\r
        if(strcmp(p1, "*") != 0)\r
        {\r
                if(strcmp(p1, "*.") == 0)\r
                {\r
                        p = strchr(p2, '.');\r
                        if((p != NULL) && (*(p+1) != NUL))\r
-                               Sts = FAIL;\r
+                               Sts = FFFTP_FAIL;\r
                }\r
                else\r
                        Sts = CheckNameMatch(p2, p1);\r
@@ -108,7 +108,7 @@ int CheckFname(char *str, char *regexp)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int CheckNameMatch(char *str, char *regexp)\r
@@ -128,23 +128,23 @@ static int CheckNameMatch(char *str, char *regexp)
                                /* Look for a character matching the one after the '*' */\r
                                p++;\r
                                if(*p == NUL)\r
-                                       return SUCCESS; /* Automatic match */\r
+                                       return FFFTP_SUCCESS; /* Automatic match */\r
                                while(*str != NUL)\r
                                {\r
                                        while((*str != NUL) && (toupper(*p)!=toupper(*str)))\r
                                                str++;\r
                                        if(CheckNameMatch(str, p))\r
-                                               return SUCCESS;\r
+                                               return FFFTP_SUCCESS;\r
                                        if(*str == NUL)\r
-                                               return FAIL;\r
+                                               return FFFTP_FAIL;\r
                                        else\r
                                                str++;\r
                                }\r
-                               return FAIL;\r
+                               return FFFTP_FAIL;\r
 \r
                        default:\r
                                if(toupper(*str) != toupper(*p))\r
-                                       return FAIL;\r
+                                       return FFFTP_FAIL;\r
                                str++;\r
                                p++;\r
                                break;\r
@@ -152,10 +152,10 @@ static int CheckNameMatch(char *str, char *regexp)
        }\r
 \r
        if((*p == NUL) && (*str == NUL))\r
-               return SUCCESS;\r
+               return FFFTP_SUCCESS;\r
 \r
        if ((*p != NUL) && (str[0] == '.') && (str[1] == 0))\r
-               return(SUCCESS);\r
+               return(FFFTP_SUCCESS);\r
   \r
        if ((*str == NUL) && (*p == '?'))\r
        {\r
@@ -165,8 +165,8 @@ static int CheckNameMatch(char *str, char *regexp)
        }\r
 \r
        if((*str == NUL) && (*p == '*') && (p[1] == '\0'))\r
-               return SUCCESS;\r
+               return FFFTP_SUCCESS;\r
 \r
-       return FAIL;\r
+       return FFFTP_FAIL;\r
 }\r
 \r