Simplify apr_errprintf() to return a structure instead of a status.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1839815 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 9 insertions, 11 deletions

diff --git a/util-misc/apr_error.c b/util-misc/apr_error.c
index a3835e1a9..7cb30cb4e 100644
--- a/util-misc/apr_error.c
+++ b/util-misc/apr_error.c
@@ -19,27 +19,25 @@
 #include "apr_pools.h"
 #include "apu_errno.h"
 
-APR_DECLARE_NONSTD(apr_status_t) apr_errprintf(apu_err_t **result,
+APR_DECLARE_NONSTD(apu_err_t *) apr_errprintf(apu_err_t *result,
         apr_pool_t *p, const char *reason, int rc, const char *fmt, ...)
 {
     va_list ap;
-    apu_err_t *res;
 
-    res = *result;
-    if (!res) {
-        res = *result = apr_pcalloc(p, sizeof(apu_err_t));
-        if (!res) {
-            return APR_ENOMEM;
+    if (!result) {
+        result = apr_pcalloc(p, sizeof(apu_err_t));
+        if (!result) {
+            return NULL;
         }
     }
 
     va_start(ap, fmt);
-    res->msg = apr_pvsprintf(p, fmt, ap);
+    result->msg = apr_pvsprintf(p, fmt, ap);
     va_end(ap);
 
-    res->reason = reason;
-    res->rc = rc;
+    result->reason = reason;
+    result->rc = rc;
 
-    return APR_SUCCESS;
+    return result;
 }