Mercurial > hg > nginx
changeset 6000:93fee708f168
Log: use ngx_cpymem() in a couple of places, no functional changes.
author | Valentin Bartenev <vbart@nginx.com> |
---|---|
date | Wed, 04 Mar 2015 19:20:30 +0300 |
parents | 4d8936b1fc32 |
children | add12ee1d01c |
files | src/core/ngx_log.c |
diffstat | 1 files changed, 3 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_log.c Tue Mar 03 17:48:57 2015 +0300 +++ b/src/core/ngx_log.c Wed Mar 04 19:20:30 2015 +0300 @@ -97,10 +97,8 @@ last = errstr + NGX_MAX_ERROR_STR; - ngx_memcpy(errstr, ngx_cached_err_log_time.data, - ngx_cached_err_log_time.len); - - p = errstr + ngx_cached_err_log_time.len; + p = ngx_cpymem(errstr, ngx_cached_err_log_time.data, + ngx_cached_err_log_time.len); p = ngx_slprintf(p, last, " [%V] ", &err_levels[level]); @@ -248,9 +246,8 @@ u_char errstr[NGX_MAX_ERROR_STR]; last = errstr + NGX_MAX_ERROR_STR; - p = errstr + 7; - ngx_memcpy(errstr, "nginx: ", 7); + p = ngx_cpymem(errstr, "nginx: ", 7); va_start(args, fmt); p = ngx_vslprintf(p, last, fmt, args);