httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r832910 - in /httpd/httpd/trunk/modules/lua: lua_config.c lua_request.c mod_lua.c
Date Wed, 04 Nov 2009 23:39:58 GMT
Author: jorton
Date: Wed Nov  4 23:39:57 2009
New Revision: 832910

URL: http://svn.apache.org/viewvc?rev=832910&view=rev
Log:
* modules/lua/: s/apr_strnatcmp/strcmp/ - strnat*cmp functions are
  for natural order string sorting.

Modified:
    httpd/httpd/trunk/modules/lua/lua_config.c
    httpd/httpd/trunk/modules/lua/lua_request.c
    httpd/httpd/trunk/modules/lua/mod_lua.c

Modified: httpd/httpd/trunk/modules/lua/lua_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/lua_config.c?rev=832910&r1=832909&r2=832910&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/lua_config.c (original)
+++ httpd/httpd/trunk/modules/lua/lua_config.c Wed Nov  4 23:39:57 2009
@@ -36,15 +36,15 @@
 
 static int apl_toscope(const char *name)
 {
-    if (0 == apr_strnatcmp("once", name))
+    if (0 == strcmp("once", name))
         return APL_SCOPE_ONCE;
-    if (0 == apr_strnatcmp("request", name))
+    if (0 == strcmp("request", name))
         return APL_SCOPE_REQUEST;
-    if (0 == apr_strnatcmp("connection", name))
+    if (0 == strcmp("connection", name))
         return APL_SCOPE_CONN;
-    if (0 == apr_strnatcmp("conn", name))
+    if (0 == strcmp("conn", name))
         return APL_SCOPE_CONN;
-    if (0 == apr_strnatcmp("server", name))
+    if (0 == strcmp("server", name))
         return APL_SCOPE_SERVER;
     return APL_SCOPE_ONCE;
 }

Modified: httpd/httpd/trunk/modules/lua/lua_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/lua_request.c?rev=832910&r1=832909&r2=832910&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/lua_request.c (original)
+++ httpd/httpd/trunk/modules/lua/lua_request.c Wed Nov  4 23:39:57 2009
@@ -454,25 +454,25 @@
     /* const char* key = luaL_checkstring(L, -2); */
     request_rec *r = ap_lua_check_request_rec(L, 1);
     key = luaL_checkstring(L, 2);
-    if (0 == apr_strnatcmp("status", key)) {
+    if (0 == strcmp("status", key)) {
         int code = luaL_checkinteger(L, 3);
         r->status = code;
         return 0;
     }
 
-    if (0 == apr_strnatcmp("content_type", key)) {
+    if (0 == strcmp("content_type", key)) {
         const char *value = luaL_checkstring(L, 3);
         ap_set_content_type(r, apr_pstrdup(r->pool, value));
         return 0;
     }
 
-    if (0 == apr_strnatcmp("filename", key)) {
+    if (0 == strcmp("filename", key)) {
         const char *value = luaL_checkstring(L, 3);
         r->filename = apr_pstrdup(r->pool, value);
         return 0;
     }
 
-    if (0 == apr_strnatcmp("uri", key)) {
+    if (0 == strcmp("uri", key)) {
         const char *value = luaL_checkstring(L, 3);
         r->uri = apr_pstrdup(r->pool, value);
         return 0;

Modified: httpd/httpd/trunk/modules/lua/mod_lua.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/mod_lua.c?rev=832910&r1=832909&r2=832910&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/mod_lua.c (original)
+++ httpd/httpd/trunk/modules/lua/mod_lua.c Wed Nov  4 23:39:57 2009
@@ -776,13 +776,13 @@
                                        const char *arg)
 {
     ap_lua_dir_cfg *cfg = (ap_lua_dir_cfg *) _cfg;
-    if (apr_strnatcmp("stat", arg) == 0) {
+    if (strcmp("stat", arg) == 0) {
         cfg->code_cache_style = APL_CODE_CACHE_STAT;
     }
-    else if (apr_strnatcmp("forever", arg) == 0) {
+    else if (strcmp("forever", arg) == 0) {
         cfg->code_cache_style = APL_CODE_CACHE_FOREVER;
     }
-    else if (apr_strnatcmp("never", arg) == 0) {
+    else if (strcmp("never", arg) == 0) {
         cfg->code_cache_style = APL_CODE_CACHE_NEVER;
     }
     else {
@@ -798,16 +798,16 @@
                                       const char *max)
 {
     ap_lua_dir_cfg *cfg = (ap_lua_dir_cfg *) _cfg;
-    if (apr_strnatcmp("once", scope) == 0) {
+    if (strcmp("once", scope) == 0) {
         cfg->vm_scope = APL_SCOPE_ONCE;
     }
-    else if (apr_strnatcmp("request", scope) == 0) {
+    else if (strcmp("request", scope) == 0) {
         cfg->vm_scope = APL_SCOPE_REQUEST;
     }
-    else if (apr_strnatcmp("conn", scope) == 0) {
+    else if (strcmp("conn", scope) == 0) {
         cfg->vm_scope = APL_SCOPE_CONN;
     }
-    else if (apr_strnatcmp("server", scope) == 0) {
+    else if (strcmp("server", scope) == 0) {
         cfg->vm_scope = APL_SCOPE_SERVER;
         if (min)
             cfg->vm_server_pool_min = atoi(min);



Mime
View raw message