r7057: remove some ^M at end of lines

(This used to be commit 1fb60dc07dbf6f1faa0d7af3959c20469a8e36f6)

diff --git a/source4/web_server/esp/esp.c b/source4/web_server/esp/esp.c
index 4041823093e53ac54d1b5bc5fcb47202ce70e615..12a94710150345d292ea7251c8121d2b0e307958 100644 (file)
--- a/source4/web_server/esp/esp.c
+++ b/source4/web_server/esp/esp.c
@@ -167,9 +167,9 @@ EspRequest *espCreateRequest(EspHandle webServerRequestHandle, char *uri,
         *      NOTE: MaRequest::setVar does not copy into globals, whereas espSetVar
         *      does if legacy_api is defined. So variables pre-defined by MaRequest 
         *      must be copied here into globals[].\r
-        *\r
-        *      NOTE: if a variable is in session[] and in form[], the form[] will\r
-        *      override being later in the variables[] list. Use mprSetProperty \r
+        *
+        *      NOTE: if a variable is in session[] and in form[], the form[] will
+        *      override being later in the variables[] list. Use mprSetProperty 
         *      instead of mprCreateProperty to cover for this case.
         */
        for (i = 0; i < ESP_OBJ_MAX; i++) {
@@ -769,13 +769,13 @@ static int buildScript(EspRequest *ep, char **jsBuf, char *input, char **errMsg)
                        state = ESP_STATE_BEGIN;
                        break;
 
-               case ESP_TOK_INCLUDE:\r
-                       if (parse.token[0] == '/') {\r
-                               mprStrcpy(incPath, sizeof(incPath), parse.token);\r
-                       } else {\r
-                               mprGetDirName(dir, sizeof(dir), ep->uri);\r
-                               mprSprintf(incPath, sizeof(incPath), "%s/%s", \r
-                                       dir, parse.token);\r
+               case ESP_TOK_INCLUDE:
+                       if (parse.token[0] == '/') {
+                               mprStrcpy(incPath, sizeof(incPath), parse.token);
+                       } else {
+                               mprGetDirName(dir, sizeof(dir), ep->uri);
+                               mprSprintf(incPath, sizeof(incPath), "%s/%s",
+                                       dir, parse.token);
                        }
                        if (esp->mapToStorage(ep->requestHandle, path, sizeof(path),
                                        incPath, 0) < 0) {
@@ -797,11 +797,11 @@ static int buildScript(EspRequest *ep, char **jsBuf, char *input, char **errMsg)
                         */
                        incBuf = 0;
                        if ((rc = buildScript(ep, &incBuf, incText, errMsg)) < 0) {
-                               mprFree(incText);\r
-                               mprFree(parse.token);\r
+                               mprFree(incText);
+                               mprFree(parse.token);
                                return rc;
-                       }\r
-\r
+                       }
+
                        len = mprReallocStrcat(jsBuf, maxScriptSize, len, 0, incBuf, 0);
                        mprFree(incText);
                        mprFree(incBuf);
@@ -810,12 +810,12 @@ static int buildScript(EspRequest *ep, char **jsBuf, char *input, char **errMsg)
                }
                tid = getEspToken(state, &parse);
        }
-       mprFree(parse.token);\r
-       if (len < 0) {\r
-               mprAllocSprintf(errMsg, MPR_MAX_STRING, \r
-                       "Script token is too big in %s.\nConfigured maximum is %d.", \r
-                       path, maxScriptSize);\r
-               return MPR_ERR_WONT_FIT;\r
+       mprFree(parse.token);
+       if (len < 0) {
+               mprAllocSprintf(errMsg, MPR_MAX_STRING,
+                       "Script token is too big in %s.\nConfigured maximum is %d.", 
+                       path, maxScriptSize);
+               return MPR_ERR_WONT_FIT;
        }
        return rc;
 }