]> granicus.if.org Git - php/commitdiff
correct variable name
authorXinchen Hui <laruence@php.net>
Sun, 6 May 2012 12:37:03 +0000 (20:37 +0800)
committerXinchen Hui <laruence@php.net>
Sun, 6 May 2012 12:37:03 +0000 (20:37 +0800)
sapi/cli/php_cli_server.c

index a3ed390508421e41241dcd93eea3df252d4b5d37..0850425d0734b8f6c675d5b508e146a3d751c8b4 100644 (file)
@@ -1285,8 +1285,8 @@ static void php_cli_server_request_translate_vpath(php_cli_server_request *reque
        struct stat sb;
        static const char *index_files[] = { "index.php", "index.html", NULL };
        char *buf = safe_pemalloc(1, request->vpath_len, 1 + document_root_len + 1 + sizeof("index.html"), 1);
-       char *p = buf, *prev_patch = 0, *q, *vpath;
-       size_t prev_patch_len;
+       char *p = buf, *prev_path = NULL, *q, *vpath;
+       size_t prev_path_len;
        int  is_static_file = 0;
 
        if (!buf) {
@@ -1335,8 +1335,8 @@ static void php_cli_server_request_translate_vpath(php_cli_server_request *reque
                                        file++;
                                }
                                if (!*file || is_static_file) {
-                                       if (prev_patch) {
-                                               pefree(prev_patch, 1);
+                                       if (prev_path) {
+                                               pefree(prev_path, 1);
                                        }
                                        pefree(buf, 1);
                                        return;
@@ -1344,25 +1344,25 @@ static void php_cli_server_request_translate_vpath(php_cli_server_request *reque
                        }
                        break; /* regular file */
                } 
-               if (prev_patch) {
-                       pefree(prev_patch, 1);
+               if (prev_path) {
+                       pefree(prev_path, 1);
                        *q = DEFAULT_SLASH;
                }
                while (q > buf && *(--q) != DEFAULT_SLASH);
-               prev_patch_len = p - q;
-               prev_patch = pestrndup(q, prev_patch_len, 1);
+               prev_path_len = p - q;
+               prev_path = pestrndup(q, prev_path_len, 1);
                *q = '\0';
        }
-       if (prev_patch) {
-               request->path_info_len = prev_patch_len;
+       if (prev_path) {
+               request->path_info_len = prev_path_len;
 #ifdef PHP_WIN32
-               while (prev_patch_len--) {
-                       if (prev_patch[prev_patch_len] == '\\') {
-                               prev_patch[prev_patch_len] = '/';
+               while (prev_pach_len--) {
+                       if (prev_path[prev_path_len] == '\\') {
+                               prev_path[prev_path_len] = '/';
                        }
                }
 #endif
-               request->path_info = prev_patch;
+               request->path_info = prev_path;
                pefree(request->vpath, 1);
                request->vpath = pestrndup(vpath, q - vpath, 1);
                request->vpath_len = q - vpath;