mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-08-04 05:26:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

merge r2920, r2934, r3116, r3119:

Browse Source 
style fixes
This commit is contained in:
Igor Sysoev 2009-10-26 16:06:11 +00:00
parent f7f963d779
commit f10b4e07a5
6 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/ngx_hash.c
View File

@ -534,7 +534,7 @@ ngx_hash_wildcard_init(ngx_hash_init_t *hinit, ngx_hash_key_t *names,
next_name->key.len = names[n].key.len - len; next_name->key.len = names[n].key.len - len;
next_name->key.data = names[n].key.data + len; next_name->key.data = names[n].key.data + len;
next_name->key_hash= 0; next_name->key_hash = 0;
next_name->value = names[n].value; next_name->value = names[n].value;
#if 0 #if 0
@ -562,7 +562,7 @@ ngx_hash_wildcard_init(ngx_hash_init_t *hinit, ngx_hash_key_t *names,
next_name->key.len = names[i].key.len - dot_len; next_name->key.len = names[i].key.len - dot_len;
next_name->key.data = names[i].key.data + dot_len; next_name->key.data = names[i].key.data + dot_len;
next_name->key_hash= 0; next_name->key_hash = 0;
next_name->value = names[i].value; next_name->value = names[i].value;
#if 0 #if 0

5
src/core/ngx_string.c
View File

@ -30,12 +30,15 @@ ngx_cpystrn(u_char *dst, u_char *src, size_t n)
return dst; return dst;
} }
for ( /* void */ ; --n; dst++, src++) { while (--n) {
*dst = *src; *dst = *src;
if (*dst == '\0') { if (*dst == '\0') {
return dst; return dst;
} }
dst++;
src++;
} }
*dst = '\0'; *dst = '\0';