From: Greg Stein <gstein@apache.org>
Date: Wed, 24 Jan 2001 10:24:03 +0000 (+0000)
Subject: - change the prototype for apr_dbm_geterror()  [and update dav/fs/dbm.c]
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d085d2d23cad2f82e7965c13f3689327c05ff752;p=apache

- change the prototype for apr_dbm_geterror()  [and update dav/fs/dbm.c]
- fix up some error handling in apr_dbm.c
- use "dbm" consistently for the apr_dbm_t parameter


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

diff --git a/modules/dav/fs/dbm.c b/modules/dav/fs/dbm.c
index e355c848c0..dff582c605 100644
--- a/modules/dav/fs/dbm.c
+++ b/modules/dav/fs/dbm.c
@@ -97,6 +97,7 @@ static dav_error * dav_fs_dbm_error(dav_db *db, apr_pool_t *p,
     int errcode;
     const char *errstr;
     dav_error *err;
+    char errbuf[200];
 
     if (status == APR_SUCCESS)
         return NULL;
@@ -109,7 +110,8 @@ static dav_error * dav_fs_dbm_error(dav_db *db, apr_pool_t *p,
         errstr = "Could not open property database.";
     }
     else {
-        apr_dbm_geterror(db->file, &errcode, &errstr);
+        (void) apr_dbm_geterror(db->file, &errcode, errbuf, sizeof(errbuf));
+        errstr = apr_pstrdup(p, errbuf);
     }
 
     err = dav_new_error(p, HTTP_INTERNAL_SERVER_ERROR, errcode, errstr);