mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-09 02:42:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ngx_strerror_r() style and size == 0 bug fix

Browse Source
This commit is contained in:
Igor Sysoev 2008-11-25 11:26:32 +00:00
parent de2f8c4ca5
commit 33930d82ce
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/os/unix/ngx_errno.c
View File

@ -10,10 +10,11 @@
#if (NGX_HAVE_STRERROR_R) #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) { if (size == 0) {
return 0; return errstr;
} }
errstr[0] = '\0'; errstr[0] = '\0';
@ -32,12 +33,13 @@ u_char *ngx_strerror_r(int err, u_char *errstr, size_t size)
/* Linux strerror_r() */ /* 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; char *str;
if (size == 0) { if (size == 0) {
return 0; return errstr;
} }
errstr[0] = '\0'; errstr[0] = '\0';

3
src/os/win32/ngx_errno.c
View File

@ -91,7 +91,8 @@ static ngx_str_t wsa_errors[] = {
}; };
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; int n;
u_int len; u_int len;