Mercurial > hg > nginx
changeset 2335:3d8ab5957202
ngx_strerror_r() style and size == 0 bug fix
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 25 Nov 2008 11:26:32 +0000 |
parents | 6e30d64f919b |
children | 81d506883bba |
files | src/os/unix/ngx_errno.c src/os/win32/ngx_errno.c |
diffstat | 2 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os/unix/ngx_errno.c Sat Nov 22 20:42:51 2008 +0000 +++ b/src/os/unix/ngx_errno.c Tue Nov 25 11:26:32 2008 +0000 @@ -10,10 +10,11 @@ #if (NGX_HAVE_STRERROR_R) -u_char *ngx_strerror_r(int err, u_char *errstr, size_t size) +u_char * +ngx_strerror_r(int err, u_char *errstr, size_t size) { if (size == 0) { - return 0; + return errstr; } errstr[0] = '\0'; @@ -32,12 +33,13 @@ /* Linux strerror_r() */ -u_char *ngx_strerror_r(int err, u_char *errstr, size_t size) +u_char * +ngx_strerror_r(int err, u_char *errstr, size_t size) { char *str; if (size == 0) { - return 0; + return errstr; } errstr[0] = '\0';
--- a/src/os/win32/ngx_errno.c Sat Nov 22 20:42:51 2008 +0000 +++ b/src/os/win32/ngx_errno.c Tue Nov 25 11:26:32 2008 +0000 @@ -91,7 +91,8 @@ }; -u_char *ngx_strerror_r(ngx_err_t err, u_char *errstr, size_t size) +u_char * +ngx_strerror_r(ngx_err_t err, u_char *errstr, size_t size) { int n; u_int len;