Module: sip-router Branch: master Commit: b5cc82d5251b933e0e6675b7ab8d9088e45b79e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b5cc82d5...

Author: Peter Dunkley peter.dunkley@crocodile-rcs.com Committer: Peter Dunkley peter.dunkley@crocodile-rcs.com Date: Mon Apr 23 12:38:50 2012 +0100

modules/db_mysql, modules_k/db_oracle, modules_k/db_sqlite, modules_k/db_unixodbc: Reverted changes for non-pooled connections as no longer needed

- The original db_do_init() function is available so these modules don't need to be changed.

---

modules/db_mysql/km_dbase.c | 2 +- modules_k/db_oracle/dbase.c | 2 +- modules_k/db_sqlite/dbase.c | 2 +- modules_k/db_unixodbc/dbase.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index 14d4ce5..208f64e 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -133,7 +133,7 @@ static int db_mysql_submit_query(const db1_con_t* _h, const str* _s) */ db1_con_t* db_mysql_init(const str* _url) { - return db_do_init(_url, (void *)db_mysql_new_connection, 0); + return db_do_init(_url, (void *)db_mysql_new_connection); }

diff --git a/modules_k/db_oracle/dbase.c b/modules_k/db_oracle/dbase.c index dfa9cde..619cc4d 100644 --- a/modules_k/db_oracle/dbase.c +++ b/modules_k/db_oracle/dbase.c @@ -163,7 +163,7 @@ const char* db_oracle_error(ora_con_t* con, sword status) */ db1_con_t* db_oracle_init(const str* _url) { - return db_do_init(_url, (void *)db_oracle_new_connection, 0); + return db_do_init(_url, (void *)db_oracle_new_connection); }

diff --git a/modules_k/db_sqlite/dbase.c b/modules_k/db_sqlite/dbase.c index c529a7c..67db13b 100644 --- a/modules_k/db_sqlite/dbase.c +++ b/modules_k/db_sqlite/dbase.c @@ -73,7 +73,7 @@ static struct sqlite_connection * db_sqlite_new_connection(const struct db_id* i

db1_con_t* db_sqlite_init(const str* _url) { - return db_do_init(_url, (void *) db_sqlite_new_connection, 0); + return db_do_init(_url, (void *) db_sqlite_new_connection); }

diff --git a/modules_k/db_unixodbc/dbase.c b/modules_k/db_unixodbc/dbase.c index 97b9194..72edf1e 100644 --- a/modules_k/db_unixodbc/dbase.c +++ b/modules_k/db_unixodbc/dbase.c @@ -172,7 +172,7 @@ static int db_unixodbc_submit_query(const db1_con_t* _h, const str* _s) */ db1_con_t* db_unixodbc_init(const str* _url) { - return db_do_init(_url, (void*)db_unixodbc_new_connection, 0); + return db_do_init(_url, (void*)db_unixodbc_new_connection); }

/*