commit 33930d82ce80dd4cd2c20e732940d4c88e411a98
author Igor Sysoev <igor@sysoev.ru> Tue Nov 25 11:26:32 2008 +0000
committer Igor Sysoev <igor@sysoev.ru> Tue Nov 25 11:26:32 2008 +0000
tree 05b195228ac711771ccb13809683d1929e805b03
parent de2f8c4ca54eb5f156f21b993537d7316469bb0f

ngx_strerror_r() style and size == 0 bug fix

src/os/unix/ngx_errno.c

diff --git a/src/os/unix/ngx_errno.c b/src/os/unix/ngx_errno.c
index a3addf0..a250f49 100644
--- a/src/os/unix/ngx_errno.c
+++ b/src/os/unix/ngx_errno.c
@@ -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';

src/os/win32/ngx_errno.c

diff --git a/src/os/win32/ngx_errno.c b/src/os/win32/ngx_errno.c
index 268ed52..12af325 100644
--- a/src/os/win32/ngx_errno.c
+++ b/src/os/win32/ngx_errno.c
@@ -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;