style: remove duplicate checks and adjust doc

Author: zhuizhuhaomeng

README.markdown

@@ -5585,16 +5585,11 @@ ngx.escape_uri
 
 **context:** *init_by_lua*, init_worker_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua**
 
-Escape `str` as a URI component.
-
 Since `v0.10.16rc6`, this function accepts an optional `type` argument.
-```lua
-
-   type = 0 (Escape <code>str</code> as a URI)
-   type = 2 (Escape <code>str</code> as a URI component)
-```
-when type set to 0, " ", "#", "%", "?", 0x00-0x1F, 0x7F-0xFF will be escaped.
-when type set to 2, all characters excepter ALPHA, DIGIT, "-", ".", "_", "~" will be escaped.
+When `type` is set to 0, escape `str` as a URI. And these
+characters " ", "#", "%", "?", 0x00-0x1F, 0x7F-0xFF will be escaped.
+When type is set to 2 (which is the default), escape `str` as a URI
+component. All characters excepter ALPHA, DIGIT, "-", ".", "_", "~" will be escaped.
 
 [Back to TOC](#nginx-api-for-lua)
 

doc/HttpLuaModule.wiki

@@ -4690,15 +4690,11 @@ This method was introduced in the <code>0.5.0rc30</code> release.
 
 '''context:''' ''init_by_lua*, init_worker_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
-Escape <code>str</code> as a URI component.
-
 Since `v0.10.16rc6`, this function accepts an optional <code>type</code> argument.
-<geshi lang="lua">
-  type = 0 (Escape <code>str</code> as a URI)
-  type = 2 (Escape <code>str</code> as a URI component)
-</geshi>
-when type set to 0, " ", "#", "%", "?", 0x00-0x1F, 0x7F-0xFF will be escaped.
-when type set to 2, all characters excepter ALPHA, DIGIT, "-", ".", "_", "~" will be escaped.
+When <code>type</code> is set to 0, escape <code>str</code> as a URI. And these
+characters " ", "#", "%", "?", 0x00-0x1F, 0x7F-0xFF will be escaped.
+When type is set to 2 (which is the default), escape <code>str</code> as a URI
+component. All characters excepter ALPHA, DIGIT, "-", ".", "_", "~" will be escaped.
 
 == ngx.unescape_uri ==
 

src/ngx_http_lua_string.c

@@ -436,9 +436,6 @@ size_t
 ngx_http_lua_ffi_uri_escaped_length(const u_char *src, size_t len,
     int type)
 {
-    if (type < NGX_ESCAPE_URI || type > NGX_ESCAPE_MAIL_AUTH) {
-        return -1;
-    }
     return len + 2 * ngx_http_lua_escape_uri(NULL, (u_char *) src, len, type);
 }
 
@@ -447,9 +444,6 @@ void
 ngx_http_lua_ffi_escape_uri(const u_char *src, size_t len, u_char *dst,
     int type)
 {
-    if (type < NGX_ESCAPE_URI || type > NGX_ESCAPE_MAIL_AUTH) {
-        return;
-    }
     ngx_http_lua_escape_uri(dst, (u_char *) src, len, type);
 }