Commit 288a0798 authored by Nick Kew's avatar Nick Kew
Browse files

Wrap exported functions in AP_DECLARE 


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

modules/database/mod_dbd.c

+9 −8
Original line number Diff line number Diff line
@@ -119,7 +119,8 @@ static const char *dbd_param(cmd_parms *cmd, void *cfg, const char *val) 
    }

    return NULL;

}

void ap_dbd_prepare(server_rec *s, const char *query, const char *label)

AP_DECLARE(void) ap_dbd_prepare(server_rec *s, const char *query,

                                const char *label)

{

    svr_cfg *svr = ap_get_module_config(s->module_config, &dbd_module);

    dbd_prepared *prepared = apr_pcalloc(s->process->pool, sizeof(dbd_prepared));
@@ -299,7 +300,7 @@ static apr_status_t dbd_setup(apr_pool_t *pool, server_rec *s) 
        - open acquires a connection from the pool (opens one if necessary)

        - close releases it back in to the pool

*/

void ap_dbd_close(server_rec *s, ap_dbd_t *sql)

AP_DECLARE(void) ap_dbd_close(server_rec *s, ap_dbd_t *sql)

{

    svr_cfg *svr = ap_get_module_config(s->module_config, &dbd_module);

    if (!svr->persist) {
@@ -318,7 +319,7 @@ static apr_status_t dbd_close(void *CONN) 
}

#define arec ((ap_dbd_t*)rec)

#if APR_HAS_THREADS

ap_dbd_t* ap_dbd_open(apr_pool_t *pool, server_rec *s)

AP_DECLARE(ap_dbd_t*) ap_dbd_open(apr_pool_t *pool, server_rec *s)

{

    void *rec = NULL;

    svr_cfg *svr = ap_get_module_config(s->module_config, &dbd_module);
@@ -355,7 +356,7 @@ ap_dbd_t* ap_dbd_open(apr_pool_t *pool, server_rec *s) 
    return arec;

}

#else

ap_dbd_t* ap_dbd_open(apr_pool_t *pool, server_rec *s)

AP_DECLARE(ap_dbd_t*) ap_dbd_open(apr_pool_t *pool, server_rec *s)

{

    apr_status_t rv = APR_SUCCESS;

    const char *errmsg;
@@ -404,7 +405,7 @@ static apr_status_t dbd_release(void *REQ) 
    apr_reslist_release(req->dbpool, req->conn);

    return APR_SUCCESS;

}

ap_dbd_t *ap_dbd_acquire(request_rec *r)

AP_DECLARE(ap_dbd_t *) ap_dbd_acquire(request_rec *r)

{

    svr_cfg *svr;

    dbd_pool_rec *req = ap_get_module_config(r->request_config, &dbd_module);
@@ -427,7 +428,7 @@ ap_dbd_t *ap_dbd_acquire(request_rec *r) 
    }

    return req->conn;

}

ap_dbd_t *ap_dbd_cacquire(conn_rec *c)

AP_DECLARE(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)

{

    svr_cfg *svr;

    dbd_pool_rec *req = ap_get_module_config(c->conn_config, &dbd_module);
@@ -451,7 +452,7 @@ ap_dbd_t *ap_dbd_cacquire(conn_rec *c) 
    return req->conn;

}

#else

ap_dbd_t *ap_dbd_acquire(request_rec *r)

AP_DECLARE(ap_dbd_t *) ap_dbd_acquire(request_rec *r)

{

    svr_cfg *svr;

    ap_dbd_t *ret = ap_get_module_config(r->request_config, &dbd_module);
@@ -469,7 +470,7 @@ ap_dbd_t *ap_dbd_acquire(request_rec *r) 
    }

    return ret;

}

ap_dbd_t *ap_dbd_cacquire(conn_rec *c)

AP_DECLARE(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)

{

    svr_cfg *svr;

    ap_dbd_t *ret = ap_get_module_config(c->conn_config, &dbd_module);