mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-18 07:37:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename ngx_utf_...() to ngx_utf8_...()

Browse Source
This commit is contained in:
Igor Sysoev 2008-07-29 14:41:34 +00:00
parent 4c756c46cd
commit a089857143
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/ngx_string.c
View File

@ -952,7 +952,7 @@ ngx_decode_base64(ngx_str_t *dst, ngx_str_t *src)
/* /*
* ngx_utf_decode() decodes two and more bytes UTF sequences only * ngx_utf8_decode() decodes two and more bytes UTF sequences only
* the return values: * the return values:
* 0x80 - 0x10ffff valid character * 0x80 - 0x10ffff valid character
* 0x110000 - 0xfffffffd invalid sequence * 0x110000 - 0xfffffffd invalid sequence
@ -961,7 +961,7 @@ ngx_decode_base64(ngx_str_t *dst, ngx_str_t *src)
*/ */
uint32_t uint32_t
ngx_utf_decode(u_char **p, size_t n) ngx_utf8_decode(u_char **p, size_t n)
{ {
size_t len; size_t len;
uint32_t u, i, valid; uint32_t u, i, valid;
@ -1018,7 +1018,7 @@ ngx_utf_decode(u_char **p, size_t n)
size_t size_t
ngx_utf_length(u_char *p, size_t n) ngx_utf8_length(u_char *p, size_t n)
{ {
u_char c, *last; u_char c, *last;
size_t len; size_t len;
@ -1034,8 +1034,8 @@ ngx_utf_length(u_char *p, size_t n)
continue; continue;
} }
if (ngx_utf_decode(&p, n) > 0x10ffff) { if (ngx_utf8_decode(&p, n) > 0x10ffff) {
/* invalid utf */ /* invalid UTF-8 */
return n; return n;
} }
} }
@ -1045,7 +1045,7 @@ ngx_utf_length(u_char *p, size_t n)
u_char * u_char *
ngx_utf_cpystrn(u_char *dst, u_char *src, size_t n, size_t len) ngx_utf8_cpystrn(u_char *dst, u_char *src, size_t n, size_t len)
{ {
u_char c, *next; u_char c, *next;
@ -1073,8 +1073,8 @@ ngx_utf_cpystrn(u_char *dst, u_char *src, size_t n, size_t len)
next = src; next = src;
if (ngx_utf_decode(&next, len) > 0x10ffff) { if (ngx_utf8_decode(&next, len) > 0x10ffff) {
/* invalid utf */ /* invalid UTF-8 */
break; break;
} }

6
src/core/ngx_string.h
View File

@ -151,9 +151,9 @@ u_char *ngx_hex_dump(u_char *dst, u_char *src, size_t len);
void ngx_encode_base64(ngx_str_t *dst, ngx_str_t *src); void ngx_encode_base64(ngx_str_t *dst, ngx_str_t *src);
ngx_int_t ngx_decode_base64(ngx_str_t *dst, ngx_str_t *src); ngx_int_t ngx_decode_base64(ngx_str_t *dst, ngx_str_t *src);
uint32_t ngx_utf_decode(u_char **p, size_t n); uint32_t ngx_utf8_decode(u_char **p, size_t n);
size_t ngx_utf_length(u_char *p, size_t n); size_t ngx_utf8_length(u_char *p, size_t n);
u_char *ngx_utf_cpystrn(u_char *dst, u_char *src, size_t n, size_t len); u_char *ngx_utf8_cpystrn(u_char *dst, u_char *src, size_t n, size_t len);
#define NGX_ESCAPE_URI 0 #define NGX_ESCAPE_URI 0

6
src/http/modules/ngx_http_autoindex_module.c
View File

@ -329,7 +329,7 @@ ngx_http_autoindex_handler(ngx_http_request_t *r)
NGX_ESCAPE_HTML); NGX_ESCAPE_HTML);
if (r->utf8) { if (r->utf8) {
entry->utf_len = ngx_utf_length(entry->name.data, entry->name.len); entry->utf_len = ngx_utf8_length(entry->name.data, entry->name.len);
} else { } else {
entry->utf_len = len; entry->utf_len = len;
} }
@ -420,8 +420,8 @@ ngx_http_autoindex_handler(ngx_http_request_t *r)
utf_len = NGX_HTTP_AUTOINDEX_NAME_LEN + 1; utf_len = NGX_HTTP_AUTOINDEX_NAME_LEN + 1;
} }
b->last = ngx_utf_cpystrn(b->last, entry[i].name.data, b->last = ngx_utf8_cpystrn(b->last, entry[i].name.data,
utf_len, entry[i].name.len + 1); utf_len, entry[i].name.len + 1);
last = b->last; last = b->last;
} else { } else {

8
src/http/modules/ngx_http_charset_filter_module.c
View File

@ -642,7 +642,7 @@ ngx_http_charset_recode_from_utf8(ngx_pool_t *pool, ngx_buf_t *buf,
size = buf->last - src; size = buf->last - src;
saved = src; saved = src;
n = ngx_utf_decode(&saved, size); n = ngx_utf8_decode(&saved, size);
if (n == 0xfffffffe) { if (n == 0xfffffffe) {
/* incomplete UTF-8 symbol */ /* incomplete UTF-8 symbol */
@ -710,7 +710,7 @@ ngx_http_charset_recode_from_utf8(ngx_pool_t *pool, ngx_buf_t *buf,
} }
saved = ctx->saved; saved = ctx->saved;
n = ngx_utf_decode(&saved, i); n = ngx_utf8_decode(&saved, i);
c = '\0'; c = '\0';
@ -818,7 +818,7 @@ recode:
len = buf->last - src; len = buf->last - src;
n = ngx_utf_decode(&src, len); n = ngx_utf8_decode(&src, len);
if (n < 0x10000) { if (n < 0x10000) {
@ -1270,7 +1270,7 @@ ngx_http_charset_map(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
p = &table->src2dst[src * NGX_UTF_LEN] + 1; p = &table->src2dst[src * NGX_UTF_LEN] + 1;
n = ngx_utf_decode(&p, i); n = ngx_utf8_decode(&p, i);
if (n > 0xffff) { if (n > 0xffff) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,