[sr-dev] git:master: db_mysql: renamed some internal functions

Daniel-Constantin Mierla miconda at gmail.com
Thu Aug 18 00:39:09 CEST 2011


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

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date:   Thu Aug 18 00:35:48 2011 +0200

db_mysql: renamed some internal functions

- 'mysql' added in the name of some functions from DB APIv1 to be
  consistent with the rest of them

---

 modules/db_mysql/km_db_mysql.c |    4 ++--
 modules/db_mysql/km_dbase.c    |    4 ++--
 modules/db_mysql/km_dbase.h    |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c
index 2c1c777..a94cf77 100644
--- a/modules/db_mysql/km_db_mysql.c
+++ b/modules/db_mysql/km_db_mysql.c
@@ -111,8 +111,8 @@ int db_mysql_bind_api(db_func_t *dbb)
 	dbb->delete           = db_mysql_delete;
 	dbb->update           = db_mysql_update;
 	dbb->replace          = db_mysql_replace;
-	dbb->last_inserted_id = db_last_inserted_id;
-	dbb->insert_update    = db_insert_update;
+	dbb->last_inserted_id = db_mysql_last_inserted_id;
+	dbb->insert_update    = db_mysql_insert_update;
 	dbb->insert_delayed   = db_mysql_insert_delayed;
 
 	return 0;
diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c
index 8118d9a..6f344f2 100644
--- a/modules/db_mysql/km_dbase.c
+++ b/modules/db_mysql/km_dbase.c
@@ -470,7 +470,7 @@ int db_mysql_replace(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v
  * \return returns the ID as integer or returns 0 if the previous statement
  * does not use an AUTO_INCREMENT value.
  */
-int db_last_inserted_id(const db1_con_t* _h)
+int db_mysql_last_inserted_id(const db1_con_t* _h)
 {
 	if (!_h) {
 		LM_ERR("invalid parameter value\n");
@@ -487,7 +487,7 @@ int db_last_inserted_id(const db1_con_t* _h)
   * \param _v values of the keys
   * \param _n number of key=value pairs
  */
- int db_insert_update(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v,
+ int db_mysql_insert_update(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v,
 	const int _n)
  {
 	int off, ret;
diff --git a/modules/db_mysql/km_dbase.h b/modules/db_mysql/km_dbase.h
index 8d687ea..f7c2d0c 100644
--- a/modules/db_mysql/km_dbase.h
+++ b/modules/db_mysql/km_dbase.h
@@ -109,12 +109,12 @@ int db_mysql_replace(const db1_con_t* handle, const db_key_t* keys, const db_val
 /*! \brief
  * Returns the last inserted ID
  */
-int db_last_inserted_id(const db1_con_t* _h);
+int db_mysql_last_inserted_id(const db1_con_t* _h);
 
 /*! \brief
  * Insert a row into table, update on duplicate key
  */
-int db_insert_update(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v,
+int db_mysql_insert_update(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v,
 	const int _n);
 
 




More information about the sr-dev mailing list