mirror of
https://github.com/nginx/nginx.git
synced 2025-08-01 19:36:13 +08:00
merge r2920, r2934, r3116, r3119:
style fixes
This commit is contained in:
parent
f7f963d779
commit
f10b4e07a5
@ -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.data = names[n].key.data + len;
|
||||
next_name->key_hash= 0;
|
||||
next_name->key_hash = 0;
|
||||
next_name->value = names[n].value;
|
||||
|
||||
#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.data = names[i].key.data + dot_len;
|
||||
next_name->key_hash= 0;
|
||||
next_name->key_hash = 0;
|
||||
next_name->value = names[i].value;
|
||||
|
||||
#if 0
|
||||
|
@ -30,12 +30,15 @@ ngx_cpystrn(u_char *dst, u_char *src, size_t n)
|
||||
return dst;
|
||||
}
|
||||
|
||||
for ( /* void */ ; --n; dst++, src++) {
|
||||
while (--n) {
|
||||
*dst = *src;
|
||||
|
||||
if (*dst == '\0') {
|
||||
return dst;
|
||||
}
|
||||
|
||||
dst++;
|
||||
src++;
|
||||
}
|
||||
|
||||
*dst = '\0';
|
||||
|
Loading…
Reference in New Issue
Block a user