Fix DB_BIGINT support and unused vars.

(cherry picked from commit 611d47f)
OpenSIPS · May 7, 2014 · c5031b0 · c5031b0
1 parent f7f2cb4
commit c5031b0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/modules/db_berkeley/bdb_res.c b/modules/db_berkeley/bdb_res.c
@@ -370,7 +370,10 @@ int bdb_is_neq_type(db_type_t _t0, db_type_t _t1)
 	switch(_t1)
 	{
 		case DB_INT:
-			if(_t0==DB_DATETIME || _t0==DB_BITMAP)
+			if(_t0==DB_BIGINT || _t0==DB_DATETIME || _t0==DB_BITMAP)
+				return 0;
+		case DB_BIGINT:
+			if(_t0==DB_INT || _t0==DB_DATETIME || _t0==DB_BITMAP)
 				return 0;
 		case DB_DATETIME:
 			if(_t0==DB_INT)

diff --git a/modules/db_berkeley/db_berkeley.c b/modules/db_berkeley/db_berkeley.c
@@ -779,13 +779,13 @@ int bdb_delete(db_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, int _n)
 	tbl_cache_p _tbc = NULL;
 	table_p _tp = NULL;
 	char kbuf[MAX_ROW_SIZE];
-	int i, j, ret, klen;
+	int ret, klen;
 	int *lkey=NULL;
 	DBT key,data;
 	DB *db;
 	DBC *dbcp;
 
-	i = j = ret = 0;
+	ret = 0;
 	klen=MAX_ROW_SIZE;
 
 	if (_op)
@@ -908,13 +908,13 @@ int _bdb_delete_cursor(db_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, i
 	db_res_t* _r   = NULL;
 	char kbuf[MAX_ROW_SIZE];
 	char dbuf[MAX_ROW_SIZE];
-	int i, ret, klen=MAX_ROW_SIZE;
+	int ret, klen=MAX_ROW_SIZE;
 	DBT key, data;
 	DB *db;
 	DBC *dbcp;
 	int *lkey=NULL;
 
-	i = ret = 0;
+	ret = 0;
 
 	if ((!_h) || !CON_TABLE(_h))
 		return -1;