From 8b06397523c440fc20e509889c5fad01ed477d26 Mon Sep 17 00:00:00 2001
From: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Sun, 30 Jul 2017 10:18:24 +0200
Subject: [PATCH] xhttp_pi: several compiler warning fixes

---
 src/modules/xhttp_pi/xhttp_pi_fnc.c | 44 ++++++++++++++++-------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/modules/xhttp_pi/xhttp_pi_fnc.c b/src/modules/xhttp_pi/xhttp_pi_fnc.c
index 1a26b6dba3f..01ee76b96f9 100644
--- a/src/modules/xhttp_pi/xhttp_pi_fnc.c
+++ b/src/modules/xhttp_pi/xhttp_pi_fnc.c
@@ -500,10 +500,10 @@ int ph_getDbUrlNodes(ph_framework_t *_ph_framework_data, xmlNodePtr framework_no
 			xmlFree(db_url.s);db_url.s=NULL;db_url.len=0;
 
 			for(i=0;i<_ph_framework_data->ph_db_urls_size;i++){
-				if(db_urls->id.len==ph_db_urls[i].id.len &&
-                                        strncmp(ph_db_urls[i].id.s,
-                                                db_urls->id.s,
-						db_urls->id.len)==0){
+				if(db_urls->id.len == ph_db_urls[i].id.len
+						&& strncmp(ph_db_urls[i].id.s, db_urls->id.s,
+								   db_urls->id.len)
+								   == 0) {
 					LM_ERR("duplicated %s %s [%.*s]\n",
 						XHTTP_PI_XML_DB1_URL_NODE,
 						XHTTP_PI_XML_ID_ATTR,
@@ -511,10 +511,10 @@ int ph_getDbUrlNodes(ph_framework_t *_ph_framework_data, xmlNodePtr framework_no
 						db_urls->id.s);
 					return -1;
 				}
-				if(db_urls->db_url.len==ph_db_urls[i].db_url.len &&
-                                        strncmp(ph_db_urls[i].db_url.s,
-                                                db_urls->db_url.s,
-						db_urls->db_url.len)==0){
+				if(db_urls->db_url.len == ph_db_urls[i].db_url.len
+						&& strncmp(ph_db_urls[i].db_url.s, db_urls->db_url.s,
+								   db_urls->db_url.len)
+								   == 0) {
 					LM_ERR("duplicated %s [%.*s]\n",
 						XHTTP_PI_XML_DB1_URL_NODE,
 						db_urls->db_url.len,
@@ -531,16 +531,17 @@ int ph_getDbUrlNodes(ph_framework_t *_ph_framework_data, xmlNodePtr framework_no
 			_ph_framework_data->ph_db_urls_size++;
 		}
 	}
-	if(_ph_framework_data->ph_db_urls_size==0){
+	if(ph_db_urls==NULL || _ph_framework_data->ph_db_urls_size==0){
 		LM_ERR("No [%s] node in config file\n", XHTTP_PI_XML_DB1_URL_NODE);
 		return -1;
 	}
 	/* */
-	for(i=0;i<_ph_framework_data->ph_db_urls_size;i++){
-		LM_DBG("got node %s [%d][%.*s][%.*s]\n", XHTTP_PI_XML_DB1_URL_NODE,
-			i, ph_db_urls[i].id.len, ph_db_urls[i].id.s,
-			ph_db_urls[i].db_url.len, ph_db_urls[i].db_url.s);
+	for(i = 0; i < _ph_framework_data->ph_db_urls_size; i++) {
+		LM_DBG("got node %s [%d][%.*s][%.*s]\n", XHTTP_PI_XML_DB1_URL_NODE, i,
+				ph_db_urls[i].id.len, ph_db_urls[i].id.s,
+				ph_db_urls[i].db_url.len, ph_db_urls[i].db_url.s);
 	}
+
 	/* */
 	return 0;
 }
@@ -837,7 +838,7 @@ int ph_getDbTables(ph_framework_t *_ph_framework_data, xmlNodePtr framework_node
 			*/
 		}
 	}
-	if(_ph_framework_data->ph_db_tables_size==0){
+	if(ph_db_tables==NULL || _ph_framework_data->ph_db_tables_size==0){
 		LM_ERR("No [%s] node in config file\n", XHTTP_PI_XML_DB1_TABLE_NODE);
 		return -1;
 	}
@@ -2616,9 +2617,9 @@ int getVal(db_val_t *val, db_type_t val_type, db_key_t key, ph_db_table_t *table
 					goto done;
 				}
 				arg->s[arg->len] = c;
-				LM_DBG("[%.*s]->[%d][%.*s][%d]\n",
+				LM_DBG("[%.*s]->[%d][%.*s][%d] (%d)\n",
 					arg->len, arg->s, proto,
-					host.len, host.s, port);
+					host.len, host.s, port, (int)flags);
 				continue;
 			}
 			LM_DBG("[%.*s] has flags [%d]\n", key->len, key->s, flags);
@@ -2637,9 +2638,9 @@ int getVal(db_val_t *val, db_type_t val_type, db_key_t key, ph_db_table_t *table
 					goto done;
 				}
 				arg->s[arg->len] = c;
-				LM_DBG("[%.*s]->[%d][%.*s][%d]\n",
+				LM_DBG("[%.*s]->[%d][%.*s][%d] (%d)\n",
 					arg->len, arg->s, proto,
-					host.len, host.s, port);
+					host.len, host.s, port, (int)flags);
 				if (str2ip(&host)==NULL) {
 					XHTTP_PI_BUILD_REPLY(ctx,
 						"Invalid IPv4 in [proto:]IPv4[:port]"
@@ -2660,6 +2661,7 @@ int getVal(db_val_t *val, db_type_t val_type, db_key_t key, ph_db_table_t *table
 						key->len, key->s, arg->len, arg->s);
 					goto done;
 				}
+				LM_DBG("[%.*s] has new flags [%d]\n", key->len, key->s, flags);
 				continue;
 			}
 			LM_DBG("[%.*s] has flags [%d]\n", key->len, key->s, flags);
@@ -2671,6 +2673,7 @@ int getVal(db_val_t *val, db_type_t val_type, db_key_t key, ph_db_table_t *table
 						key->len, key->s, arg->len, arg->s);
 					goto done;
 				}
+				LM_DBG("[%.*s] has new flags [%d]\n", key->len, key->s, flags);
 				continue;
 			}
 			LM_DBG("[%.*s] has flags [%d]\n", key->len, key->s, flags);
@@ -2691,6 +2694,7 @@ int getVal(db_val_t *val, db_type_t val_type, db_key_t key, ph_db_table_t *table
 						arg->len, arg->s);
 					goto done;
 				}
+				LM_DBG("[%.*s] has new flags [%d]\n", key->len, key->s, flags);
 				continue;
 			}
 			LM_DBG("[%.*s] has flags [%d]\n", key->len, key->s, flags);
@@ -2917,7 +2921,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
 		return ret;
 	} else if(arg_val.len==2 && strncmp(arg_val.s, "on", 2)==0) {
 		/* allocate c_vals array */
-		if(command->c_keys_size && command->c_keys_size){
+		if(command->c_keys_size){
 			c_vals = (db_val_t*)pkg_malloc(command->c_keys_size*sizeof(db_val_t));
 			if(c_vals==NULL){
 				LM_ERR("oom\n");
@@ -2954,7 +2958,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
 			}
 		}
 	}
-	if(command->q_keys_size && command->q_keys_size && command->type!=DB_CAP_QUERY){
+	if(command->q_keys_size && command->type!=DB_CAP_QUERY){
 		q_vals = (db_val_t*)pkg_malloc(command->q_keys_size*sizeof(db_val_t));
 		if(q_vals==NULL){
 			LM_ERR("oom\n");