Various functions prefixed with km_ to avoid conflicts.

There are many non-static functions in km_* files which need to be
renamed to avoid conflicts with functions with the same name in
other source files (originating from ser). The list of functions
prefixed with km_:

bdblib_close, bdblib_destroy, bdblib_close, bdblib_reopen,
bdblib_create_dbenv, bdblib_recover, bdblib_get_db,
bdblib_is_database, bdblib_get_table, bdblib_log,
bdblib_create_journal, bdblib_create_table, load_metadata_columns,
load_metadata_defaults, load_metadata_keys, load_metadata_readonly,
load_metadata_logflags, bdblib_valtochar, bdb_val2str, bdb_time2str,
bdblib_init, bdb_query

modules/db_berkeley/km_bdb_lib.c

@@ -46,7 +46,7 @@ static db_parms_p _db_parms = NULL;
 /**
  *
  */
-int bdblib_init(db_parms_p _p) 
+int km_bdblib_init(db_parms_p _p) 
 {
 	if (!_cachedb)
 	{
@@ -89,7 +89,7 @@ int bdblib_init(db_parms_p _p)
 /**
  * close all DBs and then the DBENV; free all memory
  */
-int bdblib_destroy(void)
+int km_bdblib_destroy(void)
 {
 	if (_cachedb)	db_free(*_cachedb);
 	if(_db_parms)	pkg_free(_db_parms);
@@ -101,7 +101,7 @@ int bdblib_destroy(void)
   assumes the lib data-structures are already initialzed;
   used to sync and reload the db file.
 */
-int bdblib_close(char* _n)
+int km_bdblib_close(char* _n)
 {
 	str s;
 	int rc;
@@ -185,7 +185,7 @@ LM_DBG("ENV %.*s \n"
   assumes the lib data-structures are already initialzed;
   used to sync and reload the db file.
 */
-int bdblib_reopen(char* _n)
+int km_bdblib_reopen(char* _n)
 {
 	str s;
 	int rc, flags;
@@ -211,9 +211,9 @@ int bdblib_reopen(char* _n)
 		!strncasecmp(s.s, _db_p->name.s,_db_p->name.len))
 		{
 			//open the whole dbenv
-			LM_DBG("-- bdblib_reopen ENV %.*s \n", s.len, s.s);
+			LM_DBG("-- km_bdblib_reopen ENV %.*s \n", s.len, s.s);
 			if(!_db_p->dbenv)
-			{	rc = bdblib_create_dbenv(&_env, _n);
+			{	rc = km_bdblib_create_dbenv(&_env, _n);
 				_db_p->dbenv = _env;
 			}
 			
@@ -231,14 +231,14 @@ int bdblib_reopen(char* _n)
 						if ((rc = db_create(&_db, _env, 0)) != 0)
 						{	_env->err(_env, rc, "db_create");
 							LM_CRIT("error in db_create, db error: %s.\n",db_strerror(rc));
-							bdblib_recover(_tbc->dtp, rc);
+							km_bdblib_recover(_tbc->dtp, rc);
 						}
 					}
 					
 					if ((rc = _db->open(_db, NULL, _n, NULL, DB_HASH, DB_CREATE, 0664)) != 0)
 					{	_db->dbenv->err(_env, rc, "DB->open: %s", _n);
 						LM_CRIT("error in db_open: %s.\n",db_strerror(rc));
-						bdblib_recover(_tbc->dtp, rc);
+						km_bdblib_recover(_tbc->dtp, rc);
 					}
 					
 					_tbc->dtp->db = _db;
@@ -269,14 +269,14 @@ int bdblib_reopen(char* _n)
 						if ((rc = db_create(&_db, _env, 0)) != 0)
 						{	_env->err(_env, rc, "db_create");
 							LM_CRIT("error in db_create, db error: %s.\n",db_strerror(rc));
-							bdblib_recover(_tbc->dtp, rc);
+							km_bdblib_recover(_tbc->dtp, rc);
 						}
 					}
 					
 					if ((rc = _db->open(_db, NULL, _n, NULL, DB_HASH, DB_CREATE, 0664)) != 0)
 					{	_db->dbenv->err(_env, rc, "DB->open: %s", _n);
 						LM_CRIT("bdb open: %s.\n",db_strerror(rc));
-						bdblib_recover(_tbc->dtp, rc);
+						km_bdblib_recover(_tbc->dtp, rc);
 					}
 					_tbc->dtp->db = _db;
 					lock_release(&_tbc->dtp->sem);
@@ -295,7 +295,7 @@ int bdblib_reopen(char* _n)
 /**
  *
  */
-int bdblib_create_dbenv(DB_ENV **_dbenv, char* _home)
+int km_bdblib_create_dbenv(DB_ENV **_dbenv, char* _home)
 {
 	DB_ENV *env;
 	char *progname;
@@ -355,7 +355,7 @@ err: (void)env->close(env, 0);
 
 /**
  */
-database_p bdblib_get_db(str *_s)
+database_p km_bdblib_get_db(str *_s)
 {
 	int rc;
 	database_p _db_p=NULL;
@@ -378,7 +378,7 @@ database_p bdblib_get_db(str *_s)
 		return _db_p;
 	}
 
-	if(!bdb_is_database(_s))
+	if(!km_bdb_is_database(_s))
 	{	
 		LM_ERR("database [%.*s] does not exists!\n" ,_s->len , _s->s);
 		return NULL;
@@ -399,9 +399,9 @@ database_p bdblib_get_db(str *_s)
 	strncpy(name, _s->s, _s->len);
 	name[_s->len] = 0;
 
-	if ((rc = bdblib_create_dbenv(&(_db_p->dbenv), name)) != 0)
+	if ((rc = km_bdblib_create_dbenv(&(_db_p->dbenv), name)) != 0)
 	{
-		LM_ERR("bdblib_create_dbenv failed");
+		LM_ERR("km_bdblib_create_dbenv failed");
 		pkg_free(_db_p->name.s);
 		pkg_free(_db_p);
 		return NULL;
@@ -418,7 +418,7 @@ database_p bdblib_get_db(str *_s)
  * look thru a linked list for the table. if dne, create a new one
  * and add to the list
 */
-tbl_cache_p bdblib_get_table(database_p _db, str *_s)
+tbl_cache_p km_bdblib_get_table(database_p _db, str *_s)
 {
 	tbl_cache_p _tbc = NULL;
 	table_p _tp = NULL;
@@ -456,7 +456,7 @@ tbl_cache_p bdblib_get_table(database_p _db, str *_s)
 		return NULL;
 	}
 
-	_tp = bdblib_create_table(_db, _s);
+	_tp = km_bdblib_create_table(_db, _s);
 
 #ifdef BDB_EXTRA_DEBUG
 	LM_DBG("table: %.*s\n", _s->len, _s->s);
@@ -483,7 +483,7 @@ tbl_cache_p bdblib_get_table(database_p _db, str *_s)
 }
 
 
-void bdblib_log(int op, table_p _tp, char* _msg, int len)
+void km_bdblib_log(int op, table_p _tp, char* _msg, int len)
 {
 	if(!_tp || !len) 		return;
 	if(! _db_parms->log_enable) 	return;
@@ -499,7 +499,7 @@ void bdblib_log(int op, table_p _tp, char* _msg, int len)
 		{
 			if((_tp->t) && (now - _tp->t) > _db_parms->journal_roll_interval)
 			{	/*try to roll logfile*/
-				if(bdblib_create_journal(_tp))
+				if(km_bdblib_create_journal(_tp))
 				{
 					LM_ERR("Journaling has FAILED !\n");
 					return;
@@ -559,7 +559,7 @@ void bdblib_log(int op, table_p _tp, char* _msg, int len)
  * Function returns NULL on error, which will cause openser to exit.
  *
  */
-table_p bdblib_create_table(database_p _db, str *_s)
+table_p km_bdblib_create_table(database_p _db, str *_s)
 {
 
 	int rc,i,flags;
@@ -628,7 +628,7 @@ table_p bdblib_create_table(database_p _db, str *_s)
 	/*load metadata; seeded\db_loaded when database are created*/
 	
 	/*initialize columns with metadata*/
-	rc = load_metadata_columns(tp);
+	rc = km_load_metadata_columns(tp);
 	if(rc!=0)
 	{
 		LM_ERR("FAILED to load METADATA COLS in table: %s.\n", tblname);
@@ -636,14 +636,14 @@ table_p bdblib_create_table(database_p _db, str *_s)
 	}
 	
 	/*initialize columns default values from metadata*/
-	rc = load_metadata_defaults(tp);
+	rc = km_load_metadata_defaults(tp);
 	if(rc!=0)
 	{
 		LM_ERR("FAILED to load METADATA DEFAULTS in table: %s.\n", tblname);
 		goto error;
 	}
 	
-	rc = load_metadata_keys(tp);
+	rc = km_load_metadata_keys(tp);
 	if(rc!=0)
 	{
 		LM_ERR("FAILED to load METADATA KEYS in table: %s.\n", tblname);
@@ -652,7 +652,7 @@ table_p bdblib_create_table(database_p _db, str *_s)
 	}
 
 	/*opened RW by default; Query to set the RO flag */
-	rc = load_metadata_readonly(tp);
+	rc = km_load_metadata_readonly(tp);
 	if(rc!=0)
 	{
 		LM_INFO("No METADATA_READONLY in table: %s.\n", tblname);
@@ -695,12 +695,12 @@ table_p bdblib_create_table(database_p _db, str *_s)
 	/* set the journaling flags; flags indicate which operations
 	   need to be journalled. (e.g possible to only journal INSERT.)
 	*/
-	rc = load_metadata_logflags(tp);
+	rc = km_load_metadata_logflags(tp);
 	if(rc!=0)
 		LM_INFO("No METADATA_LOGFLAGS in table: %s.\n", tblname);
 	
 	if ((tp->logflags & JLOG_FILE) == JLOG_FILE)
-		bdblib_create_journal(tp);
+		km_bdblib_create_journal(tp);
 	
 	return tp;
 	
@@ -713,7 +713,7 @@ error:
 	return NULL;
 }
 
-int bdblib_create_journal(table_p _tp)
+int km_bdblib_create_journal(table_p _tp)
 {
 	char *s;
 	char fn[1024];
@@ -767,7 +767,7 @@ int bdblib_create_journal(table_p _tp)
 
 }
 
-int load_metadata_columns(table_p _tp)
+int km_load_metadata_columns(table_p _tp)
 {
 	int ret,n,len;
 	char dbuf[MAX_ROW_SIZE];
@@ -799,7 +799,7 @@ int load_metadata_columns(table_p _tp)
 	
 	if ((ret = db->get(db, NULL, &key, &data, 0)) != 0) 
 	{
-		db->err(db, ret, "load_metadata_columns DB->get failed");
+		db->err(db, ret, "km_load_metadata_columns DB->get failed");
 		LM_ERR("FAILED to find METADATA_COLUMNS in DB \n");
 		return -1;
 	}
@@ -851,7 +851,7 @@ int load_metadata_columns(table_p _tp)
 	return 0;
 }
 
-int load_metadata_keys(table_p _tp)
+int km_load_metadata_keys(table_p _tp)
 {
 	int ret,n,ci;
 	char dbuf[MAX_ROW_SIZE];
@@ -875,7 +875,7 @@ int load_metadata_keys(table_p _tp)
 	
 	if ((ret = db->get(db, NULL, &key, &data, 0)) != 0) 
 	{
-		db->err(db, ret, "load_metadata_keys DB->get failed");
+		db->err(db, ret, "km_load_metadata_keys DB->get failed");
 		LM_ERR("FAILED to find METADATA in table \n");
 		return ret;
 	}
@@ -896,7 +896,7 @@ int load_metadata_keys(table_p _tp)
 }
 
 
-int load_metadata_readonly(table_p _tp)
+int km_load_metadata_readonly(table_p _tp)
 {
 	int i, ret;
 	char dbuf[MAX_ROW_SIZE];
@@ -928,7 +928,7 @@ int load_metadata_readonly(table_p _tp)
 	return 0;
 }
 
-int load_metadata_logflags(table_p _tp)
+int km_load_metadata_logflags(table_p _tp)
 {
 	int i, ret;
 	char dbuf[MAX_ROW_SIZE];
@@ -960,7 +960,7 @@ int load_metadata_logflags(table_p _tp)
 	return 0;
 }
 
-int load_metadata_defaults(table_p _tp)
+int km_load_metadata_defaults(table_p _tp)
 {
 	int ret,n,len;
 	char dbuf[MAX_ROW_SIZE];
@@ -1041,7 +1041,7 @@ int load_metadata_defaults(table_p _tp)
   resulting value: _k = "KEY1 | KEY2"
   ko = key only
 */
-int bdblib_valtochar(table_p _tp, int* _lres, char* _k, int* _klen, db_val_t* _v, int _n, int _ko)
+int km_bdblib_valtochar(table_p _tp, int* _lres, char* _k, int* _klen, db_val_t* _v, int _n, int _ko)
 {
 	char *p; 
 	char sk[MAX_ROW_SIZE]; // subkey(sk) val
@@ -1073,7 +1073,7 @@ int bdblib_valtochar(table_p _tp, int* _lres, char* _k, int* _klen, db_val_t* _v
 		*/
 		for(i=0;i<_n;i++)
 		{	len = total - sum;
-			if ( bdb_val2str(&_v[i], sk, &len) != 0 ) 
+			if ( km_bdb_val2str(&_v[i], sk, &len) != 0 ) 
 			{	LM_ERR("error building composite key \n");
 				return -2;
 			}
@@ -1147,7 +1147,7 @@ int bdblib_valtochar(table_p _tp, int* _lres, char* _k, int* _klen, db_val_t* _v
 #endif
 
 				len = total - sum;
-				if ( bdb_val2str(&_v[j], sk, &len) != 0)
+				if ( km_bdb_val2str(&_v[j], sk, &len) != 0)
 				{	LM_ERR("Destination buffer too short for subval %s\n",sk);
 					return -4;
 				}
@@ -1303,7 +1303,7 @@ int tbl_free(table_p _tp)
 	return 0;
 }
 
-int bdblib_recover(table_p _tp, int _rc)
+int km_bdblib_recover(table_p _tp, int _rc)
 {
 	switch(_rc)
 	{
@@ -1312,7 +1312,7 @@ int bdblib_recover(table_p _tp, int _rc)
 		
 		case DB_RUNRECOVERY:
 		LM_ERR("DB_RUNRECOVERY detected !! \n");
-		bdblib_destroy();
+		km_bdblib_destroy();
 		exit(1);
 		break;
 	}

modules/db_berkeley/km_bdb_lib.h

@@ -124,28 +124,28 @@ typedef struct _db_parms
 } db_parms_t, *db_parms_p;
 
 
-int bdblib_init(db_parms_p _parms);
-int bdblib_destroy(void);
-int bdblib_close(char* _n);
-int bdblib_reopen(char* _n);
-int bdblib_recover(table_p _tp, int error_code);
-void bdblib_log(int op, table_p _tp, char* _msg, int len);
-int bdblib_create_dbenv(DB_ENV **dbenv, char* home);
-int bdblib_create_journal(table_p _tp);
-database_p  	bdblib_get_db(str *_s);
-tbl_cache_p 	bdblib_get_table(database_p _db, str *_s);
-table_p 	bdblib_create_table(database_p _db, str *_s);
+int km_bdblib_init(db_parms_p _parms);
+int km_bdblib_destroy(void);
+int km_bdblib_close(char* _n);
+int km_bdblib_reopen(char* _n);
+int km_bdblib_recover(table_p _tp, int error_code);
+void km_bdblib_log(int op, table_p _tp, char* _msg, int len);
+int km_bdblib_create_dbenv(DB_ENV **dbenv, char* home);
+int km_bdblib_create_journal(table_p _tp);
+database_p  	km_bdblib_get_db(str *_s);
+tbl_cache_p 	km_bdblib_get_table(database_p _db, str *_s);
+table_p 	km_bdblib_create_table(database_p _db, str *_s);
 
 int db_free(database_p _dbp);
 int tbl_cache_free(tbl_cache_p _tbc);
 int tbl_free(table_p _tp);
 
-int load_metadata_columns(table_p _tp);
-int load_metadata_keys(table_p _tp);
-int load_metadata_readonly(table_p _tp);
-int load_metadata_logflags(table_p _tp);
-int load_metadata_defaults(table_p _tp);
+int km_load_metadata_columns(table_p _tp);
+int km_load_metadata_keys(table_p _tp);
+int km_load_metadata_readonly(table_p _tp);
+int km_load_metadata_logflags(table_p _tp);
+int km_load_metadata_defaults(table_p _tp);
 
-int bdblib_valtochar(table_p _tp, int* _lres, char* _k, int* _klen, db_val_t* _v, int _n, int _ko);
+int km_bdblib_valtochar(table_p _tp, int* _lres, char* _k, int* _klen, db_val_t* _v, int _n, int _ko);
 
 #endif

modules/db_berkeley/km_bdb_util.c

@@ -36,7 +36,7 @@
 /**
  *
  */
-int bdb_is_database(str *_s)
+int km_bdb_is_database(str *_s)
 {
 	DIR *dirp = NULL;
 	char buf[512];

modules/db_berkeley/km_bdb_util.h

@@ -33,7 +33,7 @@
 
 #include "../../str.h"
 
-int bdb_is_database(str *);
+int km_bdb_is_database(str *);
 
 #endif
 

modules/db_berkeley/km_bdb_val.c

@@ -47,7 +47,7 @@
  * should be done in the val2str function, as some databases
  * like db_berkeley don't need or like this at all.
  */
-inline int bdb_time2str(time_t _v, char* _s, int* _l)
+inline int km_bdb_time2str(time_t _v, char* _s, int* _l)
 {
 	struct tm* t;
 	int l;
@@ -181,7 +181,7 @@ int bdb_str2val(db_type_t _t, db_val_t* _v, char* _s, int _l)
 /*
  * Used when converting result from a query
  */
-int bdb_val2str(db_val_t* _v, char* _s, int* _len)
+int km_bdb_val2str(db_val_t* _v, char* _s, int* _len)
 {
 	int l;
 
@@ -254,7 +254,7 @@ int bdb_val2str(db_val_t* _v, char* _s, int* _len)
 		break;
 
 	case DB1_DATETIME:
-		if (bdb_time2str(VAL_TIME(_v), _s, _len) < 0) {
+		if (km_bdb_time2str(VAL_TIME(_v), _s, _len) < 0) {
 			LM_ERR("Error while converting time_t to string\n");
 			return -6;
 		} else {

modules/db_berkeley/km_bdb_val.h

@@ -35,7 +35,7 @@
 #include "../../lib/srdb1/db_res.h"
 #include "../../lib/srdb1/db_con.h"
 
-int bdb_val2str(db_val_t* _v, char* _s, int* _len);
+int km_bdb_val2str(db_val_t* _v, char* _s, int* _len);
 int bdb_str2val(db_type_t _t, db_val_t* _v, char* _s, int _l);
 
 #endif

modules/db_berkeley/km_db_berkeley.c

@@ -118,7 +118,7 @@ static int mod_init(void)
 	p.cache_size  = (4 * 1024 * 1024); //4Mb
 	p.journal_roll_interval = journal_roll_interval;
 	
-	if(bdblib_init(&p))
+	if(km_bdblib_init(&p))
 		return -1;
 
 	return 0;
@@ -126,7 +126,7 @@ static int mod_init(void)
 
 static void destroy(void)
 {
-	bdblib_destroy();
+	km_bdblib_destroy();
 }
 
 int bdb_bind_api(db_func_t *dbb)
@@ -139,7 +139,7 @@ int bdb_bind_api(db_func_t *dbb)
 	dbb->use_table   = bdb_use_table;
 	dbb->init        = bdb_init;
 	dbb->close       = bdb_close;
-	dbb->query       = (db_query_f)bdb_query;
+	dbb->query       = (db_query_f)km_bdb_query;
 	dbb->free_result = bdb_free_query;
 	dbb->insert      = (db_insert_f)bdb_insert;
 	dbb->delete      = (db_delete_f)bdb_delete; 
@@ -202,7 +202,7 @@ db1_con_t* bdb_init(const str* _sqlurl)
 	_res->tail = (unsigned long)((char*)_res+sizeof(db1_con_t));
 
 	LM_INFO("using database at: %.*s", _s.len, _s.s);
-	BDB_CON_CONNECTION(_res) = bdblib_get_db(&_s);
+	BDB_CON_CONNECTION(_res) = km_bdblib_get_db(&_s);
 	if (!BDB_CON_CONNECTION(_res))
 	{
 		LM_ERR("cannot get the link to database\n");
@@ -233,12 +233,12 @@ int bdb_reload(char* _n)
 	LM_DBG("[bdb_reload] Initiate RELOAD in %s\n", _n);
 #endif
 
-	if ((rc = bdblib_close(_n)) != 0) 
+	if ((rc = km_bdblib_close(_n)) != 0) 
 	{	LM_ERR("[bdb_reload] Error while closing db_berkeley DB.\n");
 		return rc;
 	}
 
-	if ((rc = bdblib_reopen(_n)) != 0) 
+	if ((rc = km_bdblib_reopen(_n)) != 0) 
 	{	LM_ERR("[bdb_reload] Error while reopening db_berkeley DB.\n");
 		return rc;
 	}
@@ -310,7 +310,7 @@ void bdb_check_reload(db1_con_t* _con)
 	p+=s.len;
 	*p=0;
 	
-	if( (tbc = bdblib_get_table(db, &s)) == NULL)
+	if( (tbc = km_bdblib_get_table(db, &s)) == NULL)
 		return;
 	
 	if( (tp = tbc->dtp) == NULL)
@@ -352,7 +352,7 @@ int bdb_free_query(db1_con_t* _h, db1_res_t* _r)
  * _nc: number of columns to return
  * _o: order by the specified column
  */
-int bdb_query(db1_con_t* _con, db_key_t* _k, db_op_t* _op, db_val_t* _v, 
+int km_bdb_query(db1_con_t* _con, db_key_t* _k, db_op_t* _op, db_val_t* _v, 
 			db_key_t* _c, int _n, int _nc, db_key_t _o, db1_res_t** _r)
 {
 	tbl_cache_p _tbc = NULL;
@@ -379,7 +379,7 @@ int bdb_query(db1_con_t* _con, db_key_t* _k, db_op_t* _op, db_val_t* _v,
 	if(auto_reload)
 		bdb_check_reload(_con);
 
-	_tbc = bdblib_get_table(BDB_CON_CONNECTION(_con), (str*)CON_TABLE(_con));
+	_tbc = km_bdblib_get_table(BDB_CON_CONNECTION(_con), (str*)CON_TABLE(_con));
 	if(!_tbc)
 	{	LM_WARN("table does not exist!\n");
 		return -1;
@@ -519,7 +519,7 @@ int bdb_query(db1_con_t* _con, db_key_t* _k, db_op_t* _op, db_val_t* _v,
 		return 0; 
 	}
 
-	if ( (ret = bdblib_valtochar(_tp, lkey, kbuf, &klen, _v, _n, BDB_KEY)) != 0 ) 
+	if ( (ret = km_bdblib_valtochar(_tp, lkey, kbuf, &klen, _v, _n, BDB_KEY)) != 0 ) 
 	{	LM_ERR("error in query key \n");
 		goto error;
 	}
@@ -594,7 +594,7 @@ int bdb_query(db1_con_t* _con, db_key_t* _k, db_op_t* _op, db_val_t* _v,
 		case DB_RUNRECOVERY:
 		default:
 			LM_CRIT("DB->get error: %s.\n", db_strerror(ret));
-			bdblib_recover(_tp,ret);
+			km_bdblib_recover(_tp,ret);
 			goto error;
 		}
 	}
@@ -659,7 +659,7 @@ int bdb_insert(db1_con_t* _h, db_key_t* _k, db_val_t* _v, int _n)
 		return -2;
 	}
 
-	_tbc = bdblib_get_table(BDB_CON_CONNECTION(_h), (str*)CON_TABLE(_h));
+	_tbc = km_bdblib_get_table(BDB_CON_CONNECTION(_h), (str*)CON_TABLE(_h));
 	if(!_tbc)
 	{	LM_WARN("table does not exist!\n");
 		return -3;
@@ -699,8 +699,8 @@ int bdb_insert(db1_con_t* _h, db_key_t* _k, db_val_t* _v, int _n)
 	}
 	
 	/* make the key */
-	if ( (ret = bdblib_valtochar(_tp, lkey, kbuf, &klen, _v, _n, BDB_KEY)) != 0 ) 
-	{	LM_ERR("Error in bdblib_valtochar  \n");
+	if ( (ret = km_bdblib_valtochar(_tp, lkey, kbuf, &klen, _v, _n, BDB_KEY)) != 0 ) 
+	{	LM_ERR("Error in km_bdblib_valtochar  \n");
 		ret = -9;
 		goto error;
 	}
@@ -714,8 +714,8 @@ int bdb_insert(db1_con_t* _h, db_key_t* _k, db_val_t* _v, int _n)
 	memset(&data, 0, sizeof(DBT));
 	memset(dbuf, 0, MAX_ROW_SIZE);
 
-	if ( (ret = bdblib_valtochar(_tp, lkey, dbuf, &dlen, _v, _n, BDB_VALUE)) != 0 ) 
-	{	LM_ERR("Error in bdblib_valtochar \n");
+	if ( (ret = km_bdblib_valtochar(_tp, lkey, dbuf, &dlen, _v, _n, BDB_VALUE)) != 0 ) 
+	{	LM_ERR("Error in km_bdblib_valtochar \n");
 		ret = -9;
 		goto error;
 	}
@@ -727,7 +727,7 @@ int bdb_insert(db1_con_t* _h, db_key_t* _k, db_val_t* _v, int _n)
 
 	if ((ret = db->put(db, NULL, &key, &data, 0)) == 0) 
 	{
-		bdblib_log(JLOG_INSERT, _tp, dbuf, dlen);
+		km_bdblib_log(JLOG_INSERT, _tp, dbuf, dlen);
 
 #ifdef BDB_EXTRA_DEBUG
 	LM_DBG("INSERT\nKEY:  [%.*s]\nDATA: [%.*s]\n"
@@ -748,7 +748,7 @@ int bdb_insert(db1_con_t* _h, db_key_t* _k, db_val_t* _v, int _n)
 		case DB_RUNRECOVERY:
 		default:
 			LM_CRIT("DB->put error: %s.\n", db_strerror(ret));
-			bdblib_recover(_tp, ret);
+			km_bdblib_recover(_tp, ret);
 			goto error;
 		}
 	}
@@ -788,7 +788,7 @@ int bdb_delete(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, int _n)
 	if ((!_h) || !CON_TABLE(_h))
 		return -1;
 
-	_tbc = bdblib_get_table(BDB_CON_CONNECTION(_h), (str*)CON_TABLE(_h));
+	_tbc = km_bdblib_get_table(BDB_CON_CONNECTION(_h), (str*)CON_TABLE(_h));
 	if(!_tbc)
 	{	LM_WARN("table does not exist!\n");
 		return -3;
@@ -836,7 +836,7 @@ int bdb_delete(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, int _n)
 	if(!lkey)  return -5;
 
 	/* make the key */
-	if ( (ret = bdblib_valtochar(_tp, lkey, kbuf, &klen, _v, _n, BDB_KEY)) != 0 ) 
+	if ( (ret = km_bdblib_valtochar(_tp, lkey, kbuf, &klen, _v, _n, BDB_KEY)) != 0 ) 
 	{	LM_ERR("Error in bdblib_makekey\n");
 		ret = -6;
 		goto error;
@@ -849,7 +849,7 @@ int bdb_delete(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, int _n)
 
 	if ((ret = db->del(db, NULL, &key, 0)) == 0)
 	{
-		bdblib_log(JLOG_DELETE, _tp, kbuf, klen);
+		km_bdblib_log(JLOG_DELETE, _tp, kbuf, klen);
 
 #ifdef BDB_EXTRA_DEBUG
 		LM_DBG("DELETED ROW \n KEY: %s \n", (char *)key.data);
@@ -872,7 +872,7 @@ int bdb_delete(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, int _n)
 		default:
 			LM_CRIT("DB->del error: %s.\n"
 				, db_strerror(ret));
-			bdblib_recover(_tp, ret);
+			km_bdblib_recover(_tp, ret);
 			goto error;
 		}
 	}
@@ -912,7 +912,7 @@ int _bdb_delete_cursor(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v,
 	if ((!_h) || !CON_TABLE(_h))
 		return -1;
 
-	_tbc = bdblib_get_table(BDB_CON_CONNECTION(_h), (str*)CON_TABLE(_h));
+	_tbc = km_bdblib_get_table(BDB_CON_CONNECTION(_h), (str*)CON_TABLE(_h));
 	if(!_tbc)
 	{	LM_WARN("table does not exist!\n");
 		return -3;
@@ -988,7 +988,7 @@ int _bdb_delete_cursor(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v,
 			{	
 				/* Berkeley DB error handler */
 				LM_CRIT("DB->get error: %s.\n", db_strerror(ret));
-				bdblib_recover(_tp,ret);
+				km_bdblib_recover(_tp,ret);
 			}
 			
 		}
@@ -1040,7 +1040,7 @@ int bdb_update(db1_con_t* _con, db_key_t* _k, db_op_t* _op, db_val_t* _v,
 	if (!_con || !CON_TABLE(_con) || !_uk || !_uv || _un <= 0)
 		return -1;
 
-	_tbc = bdblib_get_table(BDB_CON_CONNECTION(_con), (str*)CON_TABLE(_con));
+	_tbc = km_bdblib_get_table(BDB_CON_CONNECTION(_con), (str*)CON_TABLE(_con));
 	if(!_tbc)
 	{	LM_ERR("table does not exist\n");
 		return -1;
@@ -1084,7 +1084,7 @@ int bdb_update(db1_con_t* _con, db_key_t* _k, db_op_t* _op, db_val_t* _v,
 	
 	len = MAX_ROW_SIZE;
 	
-	if ( (ret = bdblib_valtochar(_tp, lkey, kbuf, &len, _v, _n, BDB_KEY)) != 0 ) 
+	if ( (ret = km_bdblib_valtochar(_tp, lkey, kbuf, &len, _v, _n, BDB_KEY)) != 0 ) 
 	{	LM_ERR("Error in query key \n");
 		goto cleanup;
 	}
@@ -1147,7 +1147,7 @@ int bdb_update(db1_con_t* _con, db_key_t* _k, db_op_t* _op, db_val_t* _v,
 			if (qcol == k)
 			{	/* update this col */
 				int j = MAX_ROW_SIZE - sum;
-				if( bdb_val2str( &_uv[i], t, &j) )
+				if( km_bdb_val2str( &_uv[i], t, &j) )
 				{	LM_ERR("value too long for string \n");
 					ret = -3;
 					goto cleanup;
@@ -1206,7 +1206,7 @@ next:
 	/* stage 4: INSERT new row with key*/
 	if ((ret = db->put(db, NULL, &key, &udata, 0)) == 0) 
 	{
-		bdblib_log(JLOG_UPDATE, _tp, ubuf, sum);
+		km_bdblib_log(JLOG_UPDATE, _tp, ubuf, sum);
 #ifdef BDB_EXTRA_DEBUG
 	LM_DBG("INSERT \nKEY:  [%.*s]\nDATA: [%.*s]\n"
 		, (int)   key.size
@@ -1252,7 +1252,7 @@ db_error:
 	case DB_RUNRECOVERY:
 	default:
 		LM_CRIT("DB->get error: %s.\n", db_strerror(ret));
-		bdblib_recover(_tp,ret);
+		km_bdblib_recover(_tp,ret);
 	}
 	
 	if(lkey)

modules/db_berkeley/km_db_berkeley.h

@@ -64,8 +64,8 @@ int bdb_free_query(db1_con_t* _h, db1_res_t* _r);
 /*
  * Do a query
  */
-int bdb_query(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, 
-			db_key_t* _c, int _n, int _nc, db_key_t _o, db1_res_t** _r);
+int km_bdb_query(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, 
+				 db_key_t* _c, int _n, int _nc, db_key_t _o, db1_res_t** _r);
 
 
 /*