Merge pull request #1675 from wdoekes/fix-compiler-warnings-2.4

Work around a few poor compiler warnings (2.4 branch)

modules/rabbitmq/rmq_servers.c

@@ -292,7 +292,7 @@ int rmq_server_add(modparam_t type, void * val)
 	char uri_pending = 0;
 	unsigned flags = 0;
 	char *uri;
-	int retries;
+	int retries = 0;
 	int max_frames = RMQ_DEFAULT_FRAMES;
 	int heartbeat = RMQ_DEFAULT_HEARTBEAT;
 	str exchange = {0, 0};

modules/sip_i/isup.c

@@ -677,14 +677,13 @@ int called_party_num_writef(int param_idx, int subfield_idx, unsigned char *para
 		isup_put_number(param_val + 2, num, &num_len, &oddeven);
 		/* also set oddeven, just in case it wasn't already */
 		param_val[0] = SET_BITS(param_val[0], 0x80, 7, oddeven);
-	} else
+		*len = num_len + 2;
+	} else {
 		param_val[idx[subfield_idx]] = SET_BITS(param_val[idx[subfield_idx]],
 										mask[subfield_idx], shift[subfield_idx], new_val);
-
-	if (subfield_idx == 4)
-		*len = num_len + 2;
-	else if (*len == 0)
-		*len = 2;
+		if (*len == 0)
+			*len = 2;
+	}
 
 	return 0;
 }
@@ -735,14 +734,13 @@ int calling_party_num_writef(int param_idx, int subfield_idx, unsigned char *par
 		isup_put_number(param_val + 2, num, &num_len, &oddeven);
 		/* also set oddeven, just in case it wasn't already */
 		param_val[0] = SET_BITS(param_val[0], 0x80, 7, oddeven);
-	} else
+		*len = num_len + 2;
+	} else {
 		param_val[idx[subfield_idx]] = SET_BITS(param_val[idx[subfield_idx]],
 										mask[subfield_idx], shift[subfield_idx], new_val);
-
-	if (subfield_idx == 6)
-		*len = num_len + 2;
-	else if (*len == 0)
-		*len = 2;
+		if (*len == 0)
+			*len = 2;
+	}
 
 	return 0;
 }
@@ -870,14 +868,13 @@ int connected_num_writef(int param_idx, int subfield_idx, unsigned char *param_v
 		isup_put_number(param_val + 2, num, &num_len, &oddeven);
 		/* also set oddeven, just in case it wasn't already */
 		param_val[0] = SET_BITS(param_val[0], 0x80, 7, oddeven);
-	} else
+		*len = num_len + 2;
+	} else {
 		param_val[idx[subfield_idx]] = SET_BITS(param_val[idx[subfield_idx]],
 										mask[subfield_idx], shift[subfield_idx], new_val);
-
-	if (subfield_idx == 5)
-		*len = num_len + 2;
-	else if (*len == 0)
-		*len = 2;
+		if (*len == 0)
+			*len = 2;
+	}
 
 	return 0;
 }
@@ -928,14 +925,13 @@ int original_called_num_writef(int param_idx, int subfield_idx,
 		isup_put_number(param_val + 2, num, &num_len, &oddeven);
 		/* also set oddeven, just in case it wasn't already */
 		param_val[0] = SET_BITS(param_val[0], 0x80, 7, oddeven);
-	} else
+		*len = num_len + 2;
+	} else {
 		param_val[idx[subfield_idx]] = SET_BITS(param_val[idx[subfield_idx]],
 								mask[subfield_idx], shift[subfield_idx], new_val);
-
-	if (subfield_idx == 4)
-		*len = num_len + 2;
-	else if (*len == 0)
-		*len = 2;
+		if (*len == 0)
+			*len = 2;
+	}
 
 	return 0;
 }

modules/siptrace/siptrace.c

@@ -473,7 +473,7 @@ static int parse_siptrace_id(str *suri)
 	str name={NULL, 0};
 	str trace_uri;
 	str param1={NULL, 0};
-	tlist_elem_p    elem;
+	tlist_elem_p elem;
 	enum types uri_type;
 
 
@@ -494,7 +494,8 @@ static int parse_siptrace_id(str *suri)
 		LM_ERR("bad format for uri {%.*s}\n", suri->len, suri->s);
 		return -1;
 	} else {
-		(suri->s++, suri->len--);                                 \
+		suri->s++;
+		suri->len--;
 	}
 
 	PARSE_NAME(suri, name); /*parse '[<name>]'*/
@@ -2220,7 +2221,6 @@ static void trace_tm_out(struct cell* t, int type, struct tmcb_params *ps)
 	}
 }
 
-
 /**
  * MI command format:
  * name: sip_trace

modules/usrloc/dlist.c

@@ -290,7 +290,7 @@ static int get_domain_db_ucontacts(udomain_t *d, void *buf, int *len,
 			/* write path */
 			memcpy(buf, &p1_len, sizeof p1_len);
 			buf += sizeof p1_len;
-			memcpy(buf, p1, p1_len);
+			memcpy(buf, p1, (unsigned)p1_len);
 			if (p1_len > 0)
 				next_hop_host = buf + next_hop_offset;
 			buf += p1_len;
@@ -388,7 +388,7 @@ cdb_pack_ping_data(const str *aor, const cdb_pair_t *contact,
 	struct socket_info *sock = NULL;
 	struct proxy_l next_hop;
 	str ct_uri, received = STR_NULL, path, next_hop_uri;
-	char *next_hop_host;
+	char *next_hop_host = NULL;
 	int needed;
 	char *cp = *cpos;
 	int cols_needed = COL_CONTACT | COL_RECEIVED | COL_PATH | COL_CFLAGS;
@@ -650,7 +650,7 @@ get_domain_mem_ucontacts(udomain_t *d,void *buf, int *len, unsigned int flags,
 	int needed;
 	int count;
 	int i = 0;
-	char *next_hop_host;
+	char *next_hop_host = NULL;
 	int cur_node_idx = 0, nr_nodes = 0;
 
 	cp = buf;
@@ -738,7 +738,7 @@ get_domain_mem_ucontacts(udomain_t *d,void *buf, int *len, unsigned int flags,
 					memcpy(cp, &c->path.len, sizeof(c->path.len));
 					cp = (char*)cp + sizeof(c->path.len);
 					memcpy(cp, c->path.s, c->path.len);
-					if (c->path.len)
+					if (c->path.len != 0)
 						next_hop_host = cp + (c->next_hop.name.s - c->path.s);
 					cp = (char*)cp + c->path.len;
 					memcpy(cp, &c->sock, sizeof(c->sock));