From 33930d82ce80dd4cd2c20e732940d4c88e411a98 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Tue, 25 Nov 2008 11:26:32 +0000
Subject: [PATCH] ngx_strerror_r() style and size == 0 bug fix

---
 src/os/unix/ngx_errno.c  | 10 ++++++----
 src/os/win32/ngx_errno.c |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/os/unix/ngx_errno.c b/src/os/unix/ngx_errno.c
index a3addf00c..a250f496d 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 @@ u_char *ngx_strerror_r(int err, u_char *errstr, size_t size)
 
 /* 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';
diff --git a/src/os/win32/ngx_errno.c b/src/os/win32/ngx_errno.c
index 268ed5261..12af325c7 100644
--- a/src/os/win32/ngx_errno.c
+++ b/src/os/win32/ngx_errno.c
@@ -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;
     u_int      len;