Rename db_con_t to db1_con_t to avoid conflicts with libsrdb2.

Both libraries libsrdb1 and libsrdb2 contain the data structure
db_con_t and in one if them the data structure needs to be renamed so
that both libraries can be used from one SER module at the same time.

lib/srdb1/db.c

@@ -245,13 +245,13 @@ error:
  * Initialize database module
  * \note No function should be called before this
  */
-db_con_t* db_do_init(const str* url, void* (*new_connection)())
+db1_con_t* db_do_init(const str* url, void* (*new_connection)())
 {
 	struct db_id* id;
 	void* con;
-	db_con_t* res;
+	db1_con_t* res;
 
-	int con_size = sizeof(db_con_t) + sizeof(void *);
+	int con_size = sizeof(db1_con_t) + sizeof(void *);
 	id = 0;
 	res = 0;
 
@@ -266,7 +266,7 @@ db_con_t* db_do_init(const str* url, void* (*new_connection)())
 	}
 	
 	/* this is the root memory for this database connection. */
-	res = (db_con_t*)pkg_malloc(con_size);
+	res = (db1_con_t*)pkg_malloc(con_size);
 	if (!res) {
 		LM_ERR("no private memory left\n");
 		return 0;
@@ -308,7 +308,7 @@ db_con_t* db_do_init(const str* url, void* (*new_connection)())
  * Shut down database module
  * \note No function should be called after this
  */
-void db_do_close(db_con_t* _h, void (*free_connection)())
+void db_do_close(db1_con_t* _h, void (*free_connection)())
 {
 	struct pool_con* con;
 
@@ -334,7 +334,7 @@ void db_do_close(db_con_t* _h, void (*free_connection)())
  * \param table
  * \return If there is no row for the given table, return version 0
  */
-int db_table_version(const db_func_t* dbf, db_con_t* connection, const str* table)
+int db_table_version(const db_func_t* dbf, db1_con_t* connection, const str* table)
 {
 	db_key_t key[1], col[1];
 	db_val_t val[1];
@@ -399,7 +399,7 @@ int db_table_version(const db_func_t* dbf, db_con_t* connection, const str* tabl
  * Check the table version
  * 0 means ok, -1 means an error occured
  */
-int db_check_table_version(db_func_t* dbf, db_con_t* dbh, const str* table, const unsigned int version)
+int db_check_table_version(db_func_t* dbf, db1_con_t* dbh, const str* table, const unsigned int version)
 {
 	int ver = db_table_version(dbf, dbh, table);
 	if (ver < 0) {
@@ -416,7 +416,7 @@ int db_check_table_version(db_func_t* dbf, db_con_t* dbh, const str* table, cons
  * Store name of table that will be used by
  * subsequent database functions
  */
-int db_use_table(db_con_t* _h, const str* _t)
+int db_use_table(db1_con_t* _h, const str* _t)
 {
 	if (!_h || !_t || !_t->s) {
 		LM_ERR("invalid parameter value\n");

lib/srdb1/db.h

@@ -62,7 +62,7 @@
  * \param _t table name
  * \return returns 0 if everything is OK, otherwise returns value < 0
  */
-typedef int (*db_use_table_f)(db_con_t* _h, const str * _t);
+typedef int (*db_use_table_f)(db1_con_t* _h, const str * _t);
 
 /**
  * \brief Initialize database connection and obtain the connection handle.
@@ -86,7 +86,7 @@ typedef int (*db_use_table_f)(db_con_t* _h, const str * _t);
  * \return returns a pointer to the db_con_t representing the connection if it was
  * successful, otherwise 0 is returned
  */
-typedef db_con_t* (*db_init_f) (const str* _sqlurl);
+typedef db1_con_t* (*db_init_f) (const str* _sqlurl);
 
 /**
  * \brief Close a database connection and free all memory used.
@@ -95,7 +95,7 @@ typedef db_con_t* (*db_init_f) (const str* _sqlurl);
  * allocated memory. The function db_close must be the very last function called.
  * \param _h db_con_t structure representing the database connection
  */
-typedef void (*db_close_f) (db_con_t* _h); 
+typedef void (*db_close_f) (db1_con_t* _h); 
 
 
 /**
@@ -127,7 +127,7 @@ typedef void (*db_close_f) (db_con_t* _h);
  * \param _r address of variable where pointer to the result will be stored
  * \return returns 0 if everything is OK, otherwise returns value < 0
  */
-typedef int (*db_query_f) (const db_con_t* _h, const db_key_t* _k, const db_op_t* _op,
+typedef int (*db_query_f) (const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op,
 				const db_val_t* _v, const db_key_t* _c, const int _n, const int _nc,
 				const db_key_t _o, db_res_t** _r);
 
@@ -146,7 +146,7 @@ typedef int (*db_query_f) (const db_con_t* _h, const db_key_t* _k, const db_op_t
  * \param _n the number of rows that should be fetched
  * \return returns 0 if everything is OK, otherwise returns value < 0
  */
-typedef int (*db_fetch_result_f) (const db_con_t* _h, db_res_t** _r, const int _n);
+typedef int (*db_fetch_result_f) (const db1_con_t* _h, db_res_t** _r, const int _n);
 
 
 /**
@@ -164,7 +164,7 @@ typedef int (*db_fetch_result_f) (const db_con_t* _h, db_res_t** _r, const int _
  * \param _r structure for the result
  * \return returns 0 if everything is OK, otherwise returns value < 0
  */
-typedef int (*db_raw_query_f) (const db_con_t* _h, const str* _s, db_res_t** _r);
+typedef int (*db_raw_query_f) (const db1_con_t* _h, const str* _s, db_res_t** _r);
 
 
 /**
@@ -177,7 +177,7 @@ typedef int (*db_raw_query_f) (const db_con_t* _h, const str* _s, db_res_t** _r)
  * \param _r pointer to db_res_t structure to destroy
  * \return returns 0 if everything is OK, otherwise returns value < 0
  */
-typedef int (*db_free_result_f) (db_con_t* _h, db_res_t* _r);
+typedef int (*db_free_result_f) (db1_con_t* _h, db_res_t* _r);
 
 
 /**
@@ -191,7 +191,7 @@ typedef int (*db_free_result_f) (db_con_t* _h, db_res_t* _r);
  * \param _n number of keys-value pairs int _k and _v parameters
  * \return returns 0 if everything is OK, otherwise returns value < 0
  */
-typedef int (*db_insert_f) (const db_con_t* _h, const db_key_t* _k,
+typedef int (*db_insert_f) (const db1_con_t* _h, const db_key_t* _k,
 				const db_val_t* _v, const int _n);
 
 
@@ -211,7 +211,7 @@ typedef int (*db_insert_f) (const db_con_t* _h, const db_key_t* _k,
  * \param _n number of keys-value parameters in _k and _v parameters
  * \return returns 0 if everything is OK, otherwise returns value < 0
  */
-typedef int (*db_delete_f) (const db_con_t* _h, const db_key_t* _k, const db_op_t* _o,
+typedef int (*db_delete_f) (const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o,
 				const db_val_t* _v, const int _n);
 
 
@@ -230,7 +230,7 @@ typedef int (*db_delete_f) (const db_con_t* _h, const db_key_t* _k, const db_op_
  * \param _un number of key-value pairs in _uk and _uv parameters
  * \return returns 0 if everything is OK, otherwise returns value < 0
  */
-typedef int (*db_update_f) (const db_con_t* _h, const db_key_t* _k, const db_op_t* _o,
+typedef int (*db_update_f) (const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o,
 				const db_val_t* _v, const db_key_t* _uk, const db_val_t* _uv,
 				const int _n, const int _un);
 
@@ -247,7 +247,7 @@ typedef int (*db_update_f) (const db_con_t* _h, const db_key_t* _k, const db_op_
  * \param _n number of key=value pairs
  * \return returns 0 if everything is OK, otherwise returns value < 0
 */
-typedef int (*db_replace_f) (const db_con_t* handle, const db_key_t* keys,
+typedef int (*db_replace_f) (const db1_con_t* handle, const db_key_t* keys,
 				const db_val_t* vals, const int n);
 
 
@@ -262,7 +262,7 @@ typedef int (*db_replace_f) (const db_con_t* handle, const db_key_t* keys,
  * \return returns the ID as integer or returns 0 if the previous statement
  * does not use an AUTO_INCREMENT value.
  */
-typedef int (*db_last_inserted_id_f) (const db_con_t* _h);
+typedef int (*db_last_inserted_id_f) (const db1_con_t* _h);
 
 
 /**
@@ -277,7 +277,7 @@ typedef int (*db_last_inserted_id_f) (const db_con_t* _h);
  * \param _n number of key=value pairs
  * \return returns 0 if everything is OK, otherwise returns value < 0
  */
-typedef int (*db_insert_update_f) (const db_con_t* _h, const db_key_t* _k,
+typedef int (*db_insert_update_f) (const db1_con_t* _h, const db_key_t* _k,
 				const db_val_t* _v, const int _n);
 
 
@@ -338,7 +338,7 @@ int db_bind_mod(const str* mod, db_func_t* dbf);
  * \return returns a pointer to the db_con_t representing the connection if it was
    successful, otherwise 0 is returned.
  */
-db_con_t* db_do_init(const str* url, void* (*new_connection)());
+db1_con_t* db_do_init(const str* url, void* (*new_connection)());
 
 
 /**
@@ -349,7 +349,7 @@ db_con_t* db_do_init(const str* url, void* (*new_connection)());
  * \param _h database connection handle
  * \param (*free_connection) Pointer to the db specifc free_connection method
  */
-void db_do_close(db_con_t* _h, void (*free_connection)());
+void db_do_close(db1_con_t* _h, void (*free_connection)());
 
 
 /**
@@ -362,7 +362,7 @@ void db_do_close(db_con_t* _h, void (*free_connection)());
  * \param table checked table
  * \return the version number if present, 0 if no version data available, < 0 on error
  */
-int db_table_version(const db_func_t* dbf, db_con_t* con, const str* table);
+int db_table_version(const db_func_t* dbf, db1_con_t* con, const str* table);
 
 /**
  * \brief Check the table version
@@ -374,7 +374,7 @@ int db_table_version(const db_func_t* dbf, db_con_t* con, const str* table);
  * \param version checked version
  * \return 0 means ok, -1 means an error occured
  */
-int db_check_table_version(db_func_t* dbf, db_con_t* dbh, const str* table, const unsigned int version);
+int db_check_table_version(db_func_t* dbf, db1_con_t* dbh, const str* table, const unsigned int version);
 
 /**
  * \brief Stores the name of a table.
@@ -385,7 +385,7 @@ int db_check_table_version(db_func_t* dbf, db_con_t* dbh, const str* table, cons
  * \param _t stored name
  * \return 0 if everything is ok, otherwise returns value < 0
  */
-int db_use_table(db_con_t* _h, const str* _t);
+int db_use_table(db1_con_t* _h, const str* _t);
 
 /**
  * \brief Bind the DB API exported by a module.

lib/srdb1/db_con.h

@@ -40,7 +40,7 @@
 typedef struct {
 	const str* table;      /*!< Default table that should be used              */
 	unsigned long tail;    /*!< Variable length tail, database module specific */
-} db_con_t;
+} db1_con_t;
 
 
 /** Return the table of the connection handle */

lib/srdb1/db_query.c

@@ -40,11 +40,11 @@
 static str  sql_str;
 static char sql_buf[SQL_BUF_LEN];
 
-int db_do_query(const db_con_t* _h, const db_key_t* _k, const db_op_t* _op,
+int db_do_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op,
 	const db_val_t* _v, const db_key_t* _c, const int _n, const int _nc,
-	const db_key_t _o, db_res_t** _r, int (*val2str) (const db_con_t*,
-	const db_val_t*, char*, int* _len), int (*submit_query)(const db_con_t*,
-	const str*), int (*store_result)(const db_con_t* _h, db_res_t** _r))
+	const db_key_t _o, db_res_t** _r, int (*val2str) (const db1_con_t*,
+	const db_val_t*, char*, int* _len), int (*submit_query)(const db1_con_t*,
+	const str*), int (*store_result)(const db1_con_t* _h, db_res_t** _r))
 {
 	int off, ret;
 
@@ -117,9 +117,9 @@ error:
 }
 
 
-int db_do_raw_query(const db_con_t* _h, const str* _s, db_res_t** _r,
-	int (*submit_query)(const db_con_t* _h, const str* _c),
-	int (*store_result)(const db_con_t* _h, db_res_t** _r))
+int db_do_raw_query(const db1_con_t* _h, const str* _s, db_res_t** _r,
+	int (*submit_query)(const db1_con_t* _h, const str* _c),
+	int (*store_result)(const db1_con_t* _h, db_res_t** _r))
 {
 	if (!_h || !_s || !submit_query || !store_result) {
 		LM_ERR("invalid parameter value\n");
@@ -142,9 +142,9 @@ int db_do_raw_query(const db_con_t* _h, const str* _s, db_res_t** _r,
 }
 
 
-int db_do_insert(const db_con_t* _h, const db_key_t* _k, const db_val_t* _v,
-	const int _n, int (*val2str) (const db_con_t*, const db_val_t*, char*, int*),
-	int (*submit_query)(const db_con_t* _h, const str* _c))
+int db_do_insert(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v,
+	const int _n, int (*val2str) (const db1_con_t*, const db_val_t*, char*, int*),
+	int (*submit_query)(const db1_con_t* _h, const str* _c))
 {
 	int off, ret;
 
@@ -187,9 +187,9 @@ error:
 }
 
 
-int db_do_delete(const db_con_t* _h, const db_key_t* _k, const db_op_t* _o,
-	const db_val_t* _v, const int _n, int (*val2str) (const db_con_t*,
-	const db_val_t*, char*, int*), int (*submit_query)(const db_con_t* _h,
+int db_do_delete(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o,
+	const db_val_t* _v, const int _n, int (*val2str) (const db1_con_t*,
+	const db_val_t*, char*, int*), int (*submit_query)(const db1_con_t* _h,
 	const str* _c))
 {
 	int off, ret;
@@ -230,10 +230,10 @@ error:
 }
 
 
-int db_do_update(const db_con_t* _h, const db_key_t* _k, const db_op_t* _o,
+int db_do_update(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o,
 	const db_val_t* _v, const db_key_t* _uk, const db_val_t* _uv, const int _n,
-	const int _un, int (*val2str) (const db_con_t*, const db_val_t*, char*, int*),
-	int (*submit_query)(const db_con_t* _h, const str* _c))
+	const int _un, int (*val2str) (const db1_con_t*, const db_val_t*, char*, int*),
+	int (*submit_query)(const db1_con_t* _h, const str* _c))
 {
 	int off, ret;
 
@@ -276,9 +276,9 @@ error:
 }
 
 
-int db_do_replace(const db_con_t* _h, const db_key_t* _k, const db_val_t* _v,
-	const int _n, int (*val2str) (const db_con_t*, const db_val_t*, char*,
-	int*), int (*submit_query)(const db_con_t* _h, const str* _c))
+int db_do_replace(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v,
+	const int _n, int (*val2str) (const db1_con_t*, const db_val_t*, char*,
+	int*), int (*submit_query)(const db1_con_t* _h, const str* _c))
 {
 	int off, ret;
 

lib/srdb1/db_query.h

@@ -66,11 +66,11 @@
  * \param (*store_result) function pointer to the db specific store result function
  * \return zero on success, negative on errors
  */
-int db_do_query(const db_con_t* _h, const db_key_t* _k, const db_op_t* _op,
+int db_do_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op,
 	const db_val_t* _v, const db_key_t* _c, const int _n, const int _nc,
-	const db_key_t _o, db_res_t** _r, int (*val2str) (const db_con_t*,
-	const db_val_t*, char*, int*), int (*submit_query)(const db_con_t* _h,
-	const str* _c), int (*store_result)(const db_con_t* _h, db_res_t** _r));
+	const db_key_t _o, db_res_t** _r, int (*val2str) (const db1_con_t*,
+	const db_val_t*, char*, int*), int (*submit_query)(const db1_con_t* _h,
+	const str* _c), int (*store_result)(const db1_con_t* _h, db_res_t** _r));
 
 
 /**
@@ -88,9 +88,9 @@ int db_do_query(const db_con_t* _h, const db_key_t* _k, const db_op_t* _op,
  * \param (*store_result) function pointer to the db specific store result function
  * \return zero on success, negative on errors
  */
-int db_do_raw_query(const db_con_t* _h, const str* _s, db_res_t** _r,
-	int (*submit_query)(const db_con_t* _h, const str* _c),
-	int (*store_result)(const db_con_t* _h, db_res_t** _r));
+int db_do_raw_query(const db1_con_t* _h, const str* _s, db_res_t** _r,
+	int (*submit_query)(const db1_con_t* _h, const str* _c),
+	int (*store_result)(const db1_con_t* _h, db_res_t** _r));
 
 
 /**
@@ -109,9 +109,9 @@ int db_do_raw_query(const db_con_t* _h, const str* _s, db_res_t** _r,
  * \param (*submit_query) function pointer to the db specific query submit function
  * \return zero on success, negative on errors
  */
-int db_do_insert(const db_con_t* _h, const db_key_t* _k, const db_val_t* _v,
-	const int _n, int (*val2str) (const db_con_t*, const db_val_t*, char*, int*),
-	int (*submit_query)(const db_con_t* _h, const str* _c));
+int db_do_insert(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v,
+	const int _n, int (*val2str) (const db1_con_t*, const db_val_t*, char*, int*),
+	int (*submit_query)(const db1_con_t* _h, const str* _c));
 
 
 /**
@@ -131,9 +131,9 @@ int db_do_insert(const db_con_t* _h, const db_key_t* _k, const db_val_t* _v,
  * \param (*submit_query) function pointer to the db specific query submit function
  * \return zero on success, negative on errors
  */
-int db_do_delete(const db_con_t* _h, const db_key_t* _k, const db_op_t* _o,
-	const db_val_t* _v, const int _n, int (*val2str) (const db_con_t*,
-	const db_val_t*, char*, int*), int (*submit_query)(const db_con_t* _h,
+int db_do_delete(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o,
+	const db_val_t* _v, const int _n, int (*val2str) (const db1_con_t*,
+	const db_val_t*, char*, int*), int (*submit_query)(const db1_con_t* _h,
 	const str* _c));
 
 
@@ -157,10 +157,10 @@ int db_do_delete(const db_con_t* _h, const db_key_t* _k, const db_op_t* _o,
  * \param (*submit_query) function pointer to the db specific query submit function
  * \return zero on success, negative on errors
  */
-int db_do_update(const db_con_t* _h, const db_key_t* _k, const db_op_t* _o,
+int db_do_update(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o,
 	const db_val_t* _v, const db_key_t* _uk, const db_val_t* _uv, const int _n,
-	const int _un, int (*val2str) (const db_con_t*, const db_val_t*, char*, int*),
-	int (*submit_query)(const db_con_t* _h, const str* _c));
+	const int _un, int (*val2str) (const db1_con_t*, const db_val_t*, char*, int*),
+	int (*submit_query)(const db1_con_t* _h, const str* _c));
 
 
 /**
@@ -179,9 +179,9 @@ int db_do_update(const db_con_t* _h, const db_key_t* _k, const db_op_t* _o,
  * \param (*submit_query) function pointer to the db specific query submit function
  * \return zero on success, negative on errors
  */
-int db_do_replace(const db_con_t* _h, const db_key_t* _k, const db_val_t* _v,
-	const int _n, int (*val2str) (const db_con_t*, const db_val_t*, char*,
-	int*), int (*submit_query)(const db_con_t* _h, const str* _c));
+int db_do_replace(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v,
+	const int _n, int (*val2str) (const db1_con_t*, const db_val_t*, char*,
+	int*), int (*submit_query)(const db1_con_t* _h, const str* _c));
 
 
 #endif

lib/srdb1/db_ut.c

@@ -265,8 +265,8 @@ inline int db_print_columns(char* _b, const int _l, const db_key_t* _c, const in
 /*
  * Print values of SQL statement
  */
-int db_print_values(const db_con_t* _c, char* _b, const int _l, const db_val_t* _v,
-	const int _n, int (*val2str)(const db_con_t*, const db_val_t*, char*, int*))
+int db_print_values(const db1_con_t* _c, char* _b, const int _l, const db_val_t* _v,
+	const int _n, int (*val2str)(const db1_con_t*, const db_val_t*, char*, int*))
 {
 	int i, l, len = 0;
 
@@ -294,9 +294,9 @@ int db_print_values(const db_con_t* _c, char* _b, const int _l, const db_val_t*
 /*
  * Print where clause of SQL statement
  */
-int db_print_where(const db_con_t* _c, char* _b, const int _l, const db_key_t* _k,
+int db_print_where(const db1_con_t* _c, char* _b, const int _l, const db_key_t* _k,
 	const db_op_t* _o, const db_val_t* _v, const int _n, int (*val2str)
-	(const 	db_con_t*, const db_val_t*, char*, int*))
+	(const 	db1_con_t*, const db_val_t*, char*, int*))
 {
 	int i, l, ret, len = 0;
 
@@ -338,8 +338,8 @@ int db_print_where(const db_con_t* _c, char* _b, const int _l, const db_key_t* _
 /*
  * Print set clause of update SQL statement
  */
-int db_print_set(const db_con_t* _c, char* _b, const int _l, const db_key_t* _k,
-	const db_val_t* _v, const int _n, int (*val2str)(const db_con_t*,
+int db_print_set(const db1_con_t* _c, char* _b, const int _l, const db_key_t* _k,
+	const db_val_t* _v, const int _n, int (*val2str)(const db1_con_t*,
 	const db_val_t*,char*, int*))
 {
 	int i, l, ret, len = 0;

lib/srdb1/db_ut.h

@@ -168,8 +168,8 @@ int db_print_columns(char* _b, const int _l, const db_key_t* _c, const int _n);
  * \param  (*val2str) function pointer to a db specific conversion function
  * \return the length of the printed result on success, negative on errors
  */
-int db_print_values(const db_con_t* _c, char* _b, const int _l, const db_val_t* _v,
-	const int _n, int (*val2str)(const db_con_t*, const db_val_t*, char*, int*));
+int db_print_values(const db1_con_t* _c, char* _b, const int _l, const db_val_t* _v,
+	const int _n, int (*val2str)(const db1_con_t*, const db_val_t*, char*, int*));
 
 
 /**
@@ -185,9 +185,9 @@ int db_print_values(const db_con_t* _c, char* _b, const int _l, const db_val_t*
  * \param  (*val2str) function pointer to a db specific conversion function
  * \return the length of the printed result on success, negative on errors
  */
-int db_print_where(const db_con_t* _c, char* _b, const int _l, const db_key_t* _k,
+int db_print_where(const db1_con_t* _c, char* _b, const int _l, const db_key_t* _k,
 	const db_op_t* _o, const db_val_t* _v, const int _n, int (*val2str)
-	(const 	db_con_t*, const db_val_t*, char*, int*));
+	(const 	db1_con_t*, const db_val_t*, char*, int*));
 
 
 /**
@@ -202,8 +202,8 @@ int db_print_where(const db_con_t* _c, char* _b, const int _l, const db_key_t* _
  * \param  (*val2str) function pointer to a db specific conversion function
  * \return the length of the printed result on success, negative on errors
  */
-int db_print_set(const db_con_t* _c, char* _b, const int _l,
+int db_print_set(const db1_con_t* _c, char* _b, const int _l,
 	const db_key_t* _k, const db_val_t* _v, const int _n, int (*val2str)
-	(const db_con_t*, const db_val_t*, char*, int*));
+	(const db1_con_t*, const db_val_t*, char*, int*));
 
 #endif

lib/srdb1/db_val.c

@@ -199,7 +199,7 @@ int db_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int _l,
  * \param _len target string length
  * \return 0 on success, negative on error, 1 if value must be converted by other means
  */
-int db_val2str(const db_con_t* _c, const db_val_t* _v, char* _s, int* _len)
+int db_val2str(const db1_con_t* _c, const db_val_t* _v, char* _s, int* _len)
 {
 	if (!_c || !_v || !_s || !_len || !*_len) {
 		LM_ERR("invalid parameter value\n");

lib/srdb1/db_val.h

@@ -193,6 +193,6 @@ int db_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int _l,
  * \param _len target string length
  * \return 0 on success, negative on error, 1 if value must be converted by other means
  */
-int db_val2str(const db_con_t* _c, const db_val_t* _v, char* _s, int* _len);
+int db_val2str(const db1_con_t* _c, const db_val_t* _v, char* _s, int* _len);
 
 #endif /* DB_VAL_H */