[Mod-auth-commit] mod_dbi_pool/src mod_dbi_pool.c,1.4,1.5
Brought to you by:
firechipmunk,
honx
From: <fir...@us...> - 2004-02-29 09:06:25
|
Update of /cvsroot/mod-auth/mod_dbi_pool/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15626/src Modified Files: mod_dbi_pool.c Log Message: fixed files to follow official apache style. forgot todo this before i commited for the night. Index: mod_dbi_pool.c =================================================================== RCS file: /cvsroot/mod-auth/mod_dbi_pool/src/mod_dbi_pool.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- mod_dbi_pool.c 29 Feb 2004 08:40:52 -0000 1.4 +++ mod_dbi_pool.c 29 Feb 2004 08:48:27 -0000 1.5 @@ -101,13 +101,12 @@ apr_ssize_t pos = (apr_ssize_t) cmd->info; dbi_config *temp; - if ((get_or_create_dbi_conf - (conn_id, cmd->pool, &temp)) == APR_SUCCESS) { + if ((get_or_create_dbi_conf(conn_id, cmd->pool, &temp)) == APR_SUCCESS) { /* Overwriting an existing value technically is a memory leak, since the pconf pool is only * destroyed at the termination of the whole apache process. Otoh, when processing htaccess, * we get handed the request-pool instead which is freed afterwards, so we should be fine. */ - // XXXX: Since mod_pool_dbi will be around alot longer, this needs to be fixed! + // XXXX: Since mod_pool_dbi will be around alot longer, this needs to be fixed! switch (pos) { case CONF_DBI_DRIVER: @@ -163,7 +162,8 @@ AP_INIT_TAKE2("PoolDbiPassword", set_dbi_switch_conf, (void *) CONF_DBI_PASSWORD, RSRC_CONF, "The password for the database connection"), - AP_INIT_TAKE2("PoolDbiDBName", set_dbi_switch_conf, (void *) CONF_DBI_NAME, + AP_INIT_TAKE2("PoolDbiDBName", set_dbi_switch_conf, + (void *) CONF_DBI_NAME, RSRC_CONF, "The name of the database containing the tables"), AP_INIT_TAKE2("PoolDbiConnMin", set_dbi_switch_conf, @@ -256,6 +256,7 @@ - open acquires a connection from the pool (opens one if necessary) - close releases it back in to the pool */ + dbi_conn *dbipool_open(server_rec * s) { dbi_conn *ret = NULL; |