Do proper return code to script from cachedb_* functions ( treat 0 as…

… success )
OpenSIPS · Nov 4, 2013 · 5635d71 · 5635d71
1 parent 3738a7c
commit 5635d71
Showing 1 changed file with 42 additions and 7 deletions.
diff --git a/cachedb/cachedb.c b/cachedb/cachedb.c
@@ -299,6 +299,7 @@ int cachedb_remove(str* cachedb_name, str* attr)
 	str cde_engine,grp_name;
 	char *p;
 	cachedb_con *con;
+	int ret;
 
 	if(cachedb_name == NULL || attr == NULL)
 	{
@@ -338,7 +339,11 @@ int cachedb_remove(str* cachedb_name, str* attr)
 		return -1;
 	}
 
-	return cde->cdb_func.remove(con,attr)<0?-1:1;
+	ret = cde->cdb_func.remove(con,attr);
+	if (ret == 0)
+		ret++;
+
+	return ret;
 }
 
 int cachedb_store(str* cachedb_name, str* attr, str* val,int expires)
@@ -347,6 +352,7 @@ int cachedb_store(str* cachedb_name, str* attr, str* val,int expires)
 	str cde_engine,grp_name;
 	char *p;
 	cachedb_con *con;
+	int ret;
 
 	if(cachedb_name == NULL || attr == NULL || val == NULL)
 	{
@@ -386,7 +392,11 @@ int cachedb_store(str* cachedb_name, str* attr, str* val,int expires)
 		return -1;
 	}
 
-	return cde->cdb_func.set(con,attr,val,expires)<0?-1:1;
+	ret = cde->cdb_func.set(con,attr,val,expires);
+	if (ret ==0)
+		ret++;
+
+	return ret;
 }
 
 int cachedb_fetch(str* cachedb_name, str* attr, str* val)
@@ -395,6 +405,7 @@ int cachedb_fetch(str* cachedb_name, str* attr, str* val)
 	str cde_engine,grp_name;
 	char *p;
 	cachedb_con *con;
+	int ret;
 
 	if(cachedb_name == NULL || attr == NULL || val == NULL)
 	{
@@ -434,7 +445,11 @@ int cachedb_fetch(str* cachedb_name, str* attr, str* val)
 		return -1;
 	}
 
-	return cde->cdb_func.get(con,attr,val)<0?-1:1;
+	ret = cde->cdb_func.get(con,attr,val);
+	if (ret == 0)
+		ret++;
+
+	return ret;
 }
 
 int cachedb_counter_fetch(str* cachedb_name, str* attr, int* val)
@@ -443,6 +458,7 @@ int cachedb_counter_fetch(str* cachedb_name, str* attr, int* val)
 	str cde_engine,grp_name;
 	char *p;
 	cachedb_con *con;
+	int ret;
 
 	if(cachedb_name == NULL || attr == NULL || val == NULL)
 	{
@@ -482,7 +498,11 @@ int cachedb_counter_fetch(str* cachedb_name, str* attr, int* val)
 		return -1;
 	}
 
-	return cde->cdb_func.get_counter(con,attr,val)<0?-1:1;
+	ret = cde->cdb_func.get_counter(con,attr,val);
+	if (ret == 0)
+		ret++;
+
+	return ret;
 }
 
 int cachedb_add(str* cachedb_name, str* attr, int val,int expires,int *new_val)
@@ -491,6 +511,7 @@ int cachedb_add(str* cachedb_name, str* attr, int val,int expires,int *new_val)
 	str cde_engine,grp_name;
 	char *p;
 	cachedb_con *con;
+	int ret;
 
 	if(cachedb_name == NULL || attr == NULL)
 	{
@@ -536,7 +557,11 @@ int cachedb_add(str* cachedb_name, str* attr, int val,int expires,int *new_val)
 		return -1;
 	}
 
-	return cde->cdb_func.add(con,attr,val,expires,new_val)<0?-1:1;
+	ret = cde->cdb_func.add(con,attr,val,expires,new_val);
+	if (ret == 0)
+		ret++;
+
+	return ret;
 }
 
 int cachedb_sub(str* cachedb_name, str* attr, int val,int expires,int *new_val)
@@ -545,6 +570,7 @@ int cachedb_sub(str* cachedb_name, str* attr, int val,int expires,int *new_val)
 	str cde_engine,grp_name;
 	char *p;
 	cachedb_con *con;
+	int ret;
 
 	if(cachedb_name == NULL || attr == NULL)
 	{
@@ -590,7 +616,11 @@ int cachedb_sub(str* cachedb_name, str* attr, int val,int expires,int *new_val)
 		return -1;
 	}
 
-	return cde->cdb_func.sub(con,attr,val,expires,new_val)<0?-1:1;
+	ret = cde->cdb_func.sub(con,attr,val,expires,new_val);
+	if (ret == 0)
+		ret++;
+
+	return ret;
 }
 
 cachedb_con* cachedb_do_init(str *url,void* (*new_connection)(struct cachedb_id *))
@@ -672,6 +702,7 @@ int cachedb_raw_query(str* cachedb_name, str* attr, cdb_raw_entry*** reply,int e
 	str cde_engine,grp_name;
 	char *p;
 	cachedb_con *con;
+	int ret;
 
 	if(cachedb_name == NULL || attr == NULL)
 	{
@@ -716,7 +747,11 @@ int cachedb_raw_query(str* cachedb_name, str* attr, cdb_raw_entry*** reply,int e
 		return -1;
 	}
 
-	return cde->cdb_func.raw_query(con,attr,reply,expected_kv_no,rpl_no)<0?-1:1;
+	ret = cde->cdb_func.raw_query(con,attr,reply,expected_kv_no,rpl_no);
+	if (ret == 0)
+		ret++;
+
+	return ret;
 }
 
 void free_raw_fetch(cdb_raw_entry **reply,int no_key,int no_val)