IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

use memmove() in appropriate places

Browse Source
This commit is contained in:
Igor Sysoev 2011-04-12 08:02:46 +00:00
parent d80bcbcd0f
commit d63104eea4
7 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/ngx_conf_file.c
View File

@ -507,7 +507,7 @@ ngx_conf_read_token(ngx_conf_t *cf)
}
if (len) {
ngx_memcpy(b->start, start, len);
ngx_memmove(b->start, start, len);
}
size = (ssize_t) (file_size - cf->conf_file->file.offset);

4
src/core/ngx_string.h
View File

@ -135,6 +135,10 @@ ngx_copy(u_char *dst, u_char *src, size_t len)
#endif
#define ngx_memmove(dst, src, n) (void) memmove(dst, src, n)
#define ngx_movemem(dst, src, n) (((u_char *) memmove(dst, src, n)) + (n))
/* msvc and icc7 compile memcmp() to the inline loop */
#define ngx_memcmp(s1, s2, n) memcmp((const char *) s1, (const char *) s2, n)

2
src/http/modules/ngx_http_auth_basic_module.c
View File

@ -248,7 +248,7 @@ ngx_http_auth_basic_handler(ngx_http_request_t *r)
if (state == sw_passwd) {
left = left + n - passwd;
ngx_memcpy(buf, &buf[passwd], left);
ngx_memmove(buf, &buf[passwd], left);
passwd = 0;
} else {

10
src/http/modules/ngx_http_geo_module.c
View File

@ -685,7 +685,7 @@ ngx_http_geo_add_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
range = a->elts;
ngx_memcpy(&range[i + 2], &range[i + 1],
ngx_memmove(&range[i + 2], &range[i + 1],
(a->nelts - 2 - i) * sizeof(ngx_http_geo_range_t));
range[i + 1].start = (u_short) s;
@ -724,7 +724,7 @@ ngx_http_geo_add_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
range = a->elts;
ngx_memcpy(&range[i + 3], &range[i + 1],
ngx_memmove(&range[i + 3], &range[i + 1],
(a->nelts - 3 - i) * sizeof(ngx_http_geo_range_t));
range[i + 2].start = (u_short) (e + 1);
@ -752,7 +752,7 @@ ngx_http_geo_add_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
range = a->elts;
ngx_memcpy(&range[i + 1], &range[i],
ngx_memmove(&range[i + 1], &range[i],
(a->nelts - 1 - i) * sizeof(ngx_http_geo_range_t));
range[i + 1].start = (u_short) (e + 1);
@ -776,7 +776,7 @@ ngx_http_geo_add_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
range = a->elts;
ngx_memcpy(&range[i + 2], &range[i + 1],
ngx_memmove(&range[i + 2], &range[i + 1],
(a->nelts - 2 - i) * sizeof(ngx_http_geo_range_t));
range[i + 1].start = (u_short) s;
@ -861,7 +861,7 @@ ngx_http_geo_delete_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
if (s == (ngx_uint_t) range[i].start
&& e == (ngx_uint_t) range[i].end)
{
ngx_memcpy(&range[i], &range[i + 1],
ngx_memmove(&range[i], &range[i + 1],
(a->nelts - 1 - i) * sizeof(ngx_http_geo_range_t));
a->nelts--;

2
src/http/modules/ngx_http_ssi_filter_module.c
View File

@ -1902,7 +1902,7 @@ ngx_http_ssi_include(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx,
len = (uri->data + uri->len) - src;
if (len) {
dst = ngx_copy(dst, src, len);
dst = ngx_movemem(dst, src, len);
}
uri->len = dst - uri->data;

2
src/http/ngx_http_core_module.c
View File

@ -1225,7 +1225,7 @@ ngx_http_core_try_files_phase(ngx_http_request_t *r,
*e.pos = '\0';
if (alias && ngx_strncmp(name, clcf->name.data, alias) == 0) {
ngx_memcpy(name, name + alias, len - alias);
ngx_memmove(name, name + alias, len - alias);
path.len -= alias;
}
}

2
src/http/ngx_http_script.c
View File

@ -1089,7 +1089,7 @@ ngx_http_script_regex_end_code(ngx_http_script_engine_t *e)
NGX_UNESCAPE_REDIRECT);
if (src < e->pos) {
dst = ngx_copy(dst, src, e->pos - src);
dst = ngx_movemem(dst, src, e->pos - src);
}
e->pos = dst;