Commit d085d2d2 authored by Greg Stein's avatar Greg Stein
Browse files

- 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
parent e49e41c6

modules/dav/fs/dbm.c

+3 −1
Original line number Diff line number Diff line
@@ -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);