fix a couple of lgtm issues

razvancrainea · razvancrainea · commit 6baa3aa78d09 · 2019-02-04T16:31:11.000+02:00
diff --git a/bin_interface.c b/bin_interface.c
@@ -30,8 +30,6 @@
 
 static int bin_extend(bin_packet_t *packet, int size);
 
-struct socket_info *bin;
-
 static struct packet_cb_list *reg_cbs;
 
 
diff --git a/error.c b/error.c
@@ -45,7 +45,7 @@ int ser_error=-1;
 int prev_ser_error=-1;
 
 int err2reason_phrase(
-	int ser_error,  	/*!< current internal ser error */
+	int error,			/*!< current internal ser error */
 	int *sip_error,  	/*!< the sip error code to which ser error will be turned */
 	char *phrase,    	/*!< resulting error text */
 	int etl, 		/*!< error text buffer length */
@@ -54,26 +54,26 @@ int err2reason_phrase(
 
 	char *error_txt;
 
-	switch( ser_error ) {
+	switch( error ) {
 		case E_IP_BLOCKED:
 			error_txt="Filtered destination";
-			*sip_error=-ser_error;
+			*sip_error=-error;
 			break;
 		case E_SEND:
 			error_txt="Send failed";
-			*sip_error=-ser_error;
+			*sip_error=-error;
 			break;
 		case E_BAD_ADDRESS:
 			error_txt="Unresolvable destination";
-			*sip_error=-ser_error;
+			*sip_error=-error;
 			break;
 		case E_BAD_REQ:
 			error_txt="Bad Request";
-			*sip_error=-ser_error;
+			*sip_error=-error;
 			break;
 		case E_BAD_URI:
 			error_txt="Bad URI";
-			*sip_error=-ser_error;
+			*sip_error=-error;
 			break;
 		case E_BAD_TUPEL:
 			error_txt="Transaction tuple incomplete";
@@ -120,7 +120,7 @@ int err2reason_phrase(
 			break;
 	}
 	return snprintf( phrase, etl, "%s (%d/%s)", error_txt,
-		-ser_error, signature );
+		-error, signature );
 }
 
 char *error_text( int code )
diff --git a/io_wait.h b/io_wait.h
@@ -334,7 +334,7 @@ static inline int kq_ev_change(io_wait_h* h, int fd, int filter, int flag,
  * functions (it avoids functions calls, the overhead being only an extra
  *  switch())
 */
-inline static int io_watch_add(	io_wait_h* h,
+inline static int io_watch_add(	io_wait_h* h, /* lgtm [cpp/use-of-goto] */
 								int fd,
 								fd_type type,
 								void* data,
diff --git a/mem/module_info.c b/mem/module_info.c
@@ -41,7 +41,7 @@ void* main_handle = NULL;
 volatile struct module_info* memory_mods_stats = NULL;
 int core_index;
 
-int set_mem_idx(char* mod_name, int  mem_free_idx) {
+int set_mem_idx(char* mod_name, int  new_mem_free_idx) {
 
 	int *var;
 	if(!main_handle){
@@ -53,7 +53,7 @@ int set_mem_idx(char* mod_name, int  mem_free_idx) {
 	}
 
 	if(strlen(mod_name) == 4 && (strncmp("core", mod_name, 4) == 0))
-		core_index = mem_free_idx;
+		core_index = new_mem_free_idx;
 
 	strcpy(buff, mod_name);
 	strcat(buff, STAT_SUFIX);
@@ -66,7 +66,7 @@ int set_mem_idx(char* mod_name, int  mem_free_idx) {
 		return -1;
 	}
 
-	*var = mem_free_idx;
+	*var = new_mem_free_idx;
 	LM_DBG("changed module variable %s = %d\n", buff, *var);
 
 	return 0;
diff --git a/mem/q_malloc.h b/mem/q_malloc.h
@@ -30,7 +30,7 @@
 
 
 #if !defined(q_malloc_h) && !defined(VQ_MALLOC) && !defined(F_MALLOC) && \
-	!defined(HP_MALLOC)
+	!defined(HP_MALLOC) /* lgtm [cpp/missing-header-guard] */
 #define q_malloc_h
 
 #include "meminfo.h"
diff --git a/mi/mi_trace.c b/mi/mi_trace.c
@@ -128,7 +128,7 @@ char* generate_correlation_id(int* len)
 
 
 int trace_mi_message(union sockaddr_union* src, union sockaddr_union* dst,
-		struct mi_trace_param* pld_param, str* correlation_value, trace_dest trace_dst)
+		struct mi_trace_param* pld_param, str* correlation_val, trace_dest trace_dst)
 {
 	/* FIXME is this the case for all mi impelementations?? */
 	const int proto = IPPROTO_TCP;
@@ -149,16 +149,16 @@ int trace_mi_message(union sockaddr_union* src, union sockaddr_union* dst,
 		return -1;
 	}
 
-	if ( correlation_value ) {
+	if ( correlation_val ) {
 		if ( correlation_id < 0 || correlation_vendor < 0 ) {
 			if ( load_correlation_id() < 0 ) {
 				LM_ERR("can't load correlation id!\n");
 				goto error;
 			}
 		}
 
-		if ( mi_trace_api->add_chunk( message, correlation_value->s,
-				correlation_value->len, TRACE_TYPE_STR,
+		if ( mi_trace_api->add_chunk( message, correlation_val->s,
+				correlation_val->len, TRACE_TYPE_STR,
 					correlation_id, correlation_vendor) < 0 ) {
 			LM_ERR("can't set the correlation id!\n");
 			goto error;
diff --git a/modules/call_center/call_center.c b/modules/call_center/call_center.c
@@ -911,7 +911,7 @@ static int w_agent_login(struct sip_msg *req, char *agent_v, char *state_v)
 
 	/* get state */
 	if (fixup_get_isvalue( req, (gparam_p)state_v, &state, &agent_s,
-	&flags)!=0 || ((flags|GPARAM_INT_VALUE_FLAG)==0) ) {
+	&flags)!=0 || ((flags&GPARAM_INT_VALUE_FLAG)==0) ) {
 		LM_ERR("unable to evaluate state spec \n");
 		return -1;
 	}
diff --git a/modules/imc/imc_cmd.c b/modules/imc/imc_cmd.c
@@ -794,7 +794,7 @@ int imc_handle_list(struct sip_msg* msg, imc_cmd_t *cmd,
 		goto error;
 	}
 	p = imc_body_buf;
-	strncpy(p, "Members:\n", 9);
+	memcpy(p, "Members:\n", 9);
 	p+=9;
 	imp = room->members;
 
diff --git a/modules/msilo/msfuncs.c b/modules/msilo/msfuncs.c
@@ -212,7 +212,7 @@ int m_build_headers(str *buf, str ctype, str contact, time_t date)
 		p += 14;
 		memcpy(p, ctype.s, ctype.len);
 		p += ctype.len;
-		strncpy(p, CRLF, CRLF_LEN);
+		memcpy(p, CRLF, CRLF_LEN);
 		p += CRLF_LEN;
 
 	}
@@ -251,18 +251,18 @@ int m_build_body(str *body, time_t date, str msg, time_t sdate)
 	{
 		if(sdate!=0)
 		{
-			strncpy(p, "[Reminder message - ", 20);
+			memcpy(p, "[Reminder message - ", 20);
 			p += 20;
 
-			strncpy(p, ctime(&sdate), 24);
+			memcpy(p, ctime(&sdate), 24);
 			p += 24;
 
 			*p++ = ']';
 		} else {
-			strncpy(p, "[Offline message - ", 19);
+			memcpy(p, "[Offline message - ", 19);
 			p += 19;
 
-			strncpy(p, ctime(&date), 24);
+			memcpy(p, ctime(&date), 24);
 			p += 24;
 
 			*p++ = ']';
diff --git a/name_alias.h b/name_alias.h
@@ -26,6 +26,9 @@
  *              the aliases (bogdan)
  */
 
+#ifndef NAME_ALIAS_H
+#define NAME_ALIAS_H
+
 
 #include <strings.h>
 #include "str.h"
@@ -88,4 +91,4 @@ int add_alias(char* name, int len, unsigned short port, unsigned short proto);
 /* register a new function for detecting aliases */
 int register_alias_fct( is_alias_fct *fct );
 
-
+#endif /* NAME_ALIAS_H */
diff --git a/net/proto_tcp/proto_tcp.c b/net/proto_tcp/proto_tcp.c
@@ -1201,7 +1201,7 @@ static int tcp_read_req(struct tcp_connection* con, int* bytes_read)
 	return -1;
 }
 
-static mi_response_t *w_tcp_trace_mi(const mi_params_t *params,
+static mi_response_t *w_tcp_trace_mi(const mi_params_t *mi_params,
 								struct mi_handler *async_hdl)
 {
 	mi_response_t *resp;
@@ -1220,12 +1220,12 @@ static mi_response_t *w_tcp_trace_mi(const mi_params_t *params,
 	return resp;
 }
 
-static mi_response_t *w_tcp_trace_mi_1(const mi_params_t *params,
+static mi_response_t *w_tcp_trace_mi_1(const mi_params_t *mi_params,
 								struct mi_handler *async_hdl)
 {
 	str new_mode;
 
-	if (get_mi_string_param(params, "trace_mode", &new_mode.s, &new_mode.len) < 0)
+	if (get_mi_string_param(mi_params, "trace_mode", &new_mode.s, &new_mode.len) < 0)
 		return init_mi_param_error();
 
 	if ((new_mode.s[0] | 0x20) == 'o' &&
diff --git a/resolve.c b/resolve.c
@@ -941,8 +941,12 @@ struct txt_rdata* dns_txt_parser( unsigned char* msg, unsigned char* end,
 	len = *rdata;
 	if (rdata + 1 + len >= end)
 		goto error;	/*  something fishy in the record */
+
+#if 0
+	/* Comparison is always false because len <= 255. */
 	if (len >= sizeof(txt->txt))
 		goto error; /* not enough space? */
+#endif
 	memcpy(txt->txt, rdata+1, len);
 	txt->txt[len] = 0;		/* 0-terminate string */
 	return txt;
diff --git a/socket_info.c b/socket_info.c
@@ -873,7 +873,8 @@ int get_socket_list_from_proto(unsigned int **ipList, int protocol) {
 		return 0;
 	}
 
-	*ipList = pkg_malloc(numberOfSockets * (num_ip_octets + 1) * sizeof(int));
+	*ipList = pkg_malloc(numberOfSockets *
+			(num_ip_octets + 1) * (int)sizeof(int));
 
 	/* We couldn't allocate memory for the IP List.  So all we can do is
 	 * fail. */

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ char* generate_correlation_id(int* len)`
`128`	`128`
`129`	`129`
`130`	`130`	`int trace_mi_message(union sockaddr_union* src, union sockaddr_union* dst,`
`131`		`- struct mi_trace_param* pld_param, str* correlation_value, trace_dest trace_dst)`
	`131`	`+ struct mi_trace_param* pld_param, str* correlation_val, trace_dest trace_dst)`
`132`	`132`	`{`
`133`	`133`	`/* FIXME is this the case for all mi impelementations?? */`
`134`	`134`	`const int proto = IPPROTO_TCP;`
`@@ -149,16 +149,16 @@ int trace_mi_message(union sockaddr_union* src, union sockaddr_union* dst,`
`149`	`149`	`return -1;`
`150`	`150`	`}`
`151`	`151`
`152`		`- if ( correlation_value ) {`
	`152`	`+ if ( correlation_val ) {`
`153`	`153`	`if ( correlation_id < 0 \|\| correlation_vendor < 0 ) {`
`154`	`154`	`if ( load_correlation_id() < 0 ) {`
`155`	`155`	`LM_ERR("can't load correlation id!\n");`
`156`	`156`	`goto error;`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`
`160`		`- if ( mi_trace_api->add_chunk( message, correlation_value->s,`
`161`		`- correlation_value->len, TRACE_TYPE_STR,`
	`160`	`+ if ( mi_trace_api->add_chunk( message, correlation_val->s,`
	`161`	`+ correlation_val->len, TRACE_TYPE_STR,`
`162`	`162`	`correlation_id, correlation_vendor) < 0 ) {`
`163`	`163`	`LM_ERR("can't set the correlation id!\n");`
`164`	`164`	`goto error;`
Original file line number	Diff line number	Diff line change
`@@ -911,7 +911,7 @@ static int w_agent_login(struct sip_msg req, char agent_v, char *state_v)`
`911`	`911`
`912`	`912`	`/* get state */`
`913`	`913`	`if (fixup_get_isvalue( req, (gparam_p)state_v, &state, &agent_s,`
`914`		`- &flags)!=0 \|\| ((flags\|GPARAM_INT_VALUE_FLAG)==0) ) {`
	`914`	`+ &flags)!=0 \|\| ((flags&GPARAM_INT_VALUE_FLAG)==0) ) {`
`915`	`915`	`LM_ERR("unable to evaluate state spec \n");`
`916`	`916`	`return -1;`
`917`	`917`	`}`
Original file line number	Diff line number	Diff line change
`@@ -794,7 +794,7 @@ int imc_handle_list(struct sip_msg* msg, imc_cmd_t *cmd,`
`794`	`794`	`goto error;`
`795`	`795`	`}`
`796`	`796`	`p = imc_body_buf;`
`797`		`- strncpy(p, "Members:\n", 9);`
	`797`	`+ memcpy(p, "Members:\n", 9);`
`798`	`798`	`p+=9;`
`799`	`799`	`imp = room->members;`
`800`	`800`
Original file line number	Diff line number	Diff line change
`@@ -1201,7 +1201,7 @@ static int tcp_read_req(struct tcp_connection* con, int* bytes_read)`
`1201`	`1201`	`return -1;`
`1202`	`1202`	`}`
`1203`	`1203`
`1204`		`-static mi_response_t w_tcp_trace_mi(const mi_params_t params,`
	`1204`	`+static mi_response_t w_tcp_trace_mi(const mi_params_t mi_params,`
`1205`	`1205`	`struct mi_handler *async_hdl)`
`1206`	`1206`	`{`
`1207`	`1207`	`mi_response_t *resp;`
`@@ -1220,12 +1220,12 @@ static mi_response_t w_tcp_trace_mi(const mi_params_t params,`
`1220`	`1220`	`return resp;`
`1221`	`1221`	`}`
`1222`	`1222`
`1223`		`-static mi_response_t w_tcp_trace_mi_1(const mi_params_t params,`
	`1223`	`+static mi_response_t w_tcp_trace_mi_1(const mi_params_t mi_params,`
`1224`	`1224`	`struct mi_handler *async_hdl)`
`1225`	`1225`	`{`
`1226`	`1226`	`str new_mode;`
`1227`	`1227`
`1228`		`- if (get_mi_string_param(params, "trace_mode", &new_mode.s, &new_mode.len) < 0)`
	`1228`	`+ if (get_mi_string_param(mi_params, "trace_mode", &new_mode.s, &new_mode.len) < 0)`
`1229`	`1229`	`return init_mi_param_error();`
`1230`	`1230`
`1231`	`1231`	`if ((new_mode.s[0] \| 0x20) == 'o' &&`
Original file line number	Diff line number	Diff line change
`@@ -873,7 +873,8 @@ int get_socket_list_from_proto(unsigned int **ipList, int protocol) {`
`873`	`873`	`return 0;`
`874`	`874`	`}`
`875`	`875`
`876`		`- ipList = pkg_malloc(numberOfSockets (num_ip_octets + 1) * sizeof(int));`
	`876`	`+ ipList = pkg_malloc(numberOfSockets `
	`877`	`+ (num_ip_octets + 1) * (int)sizeof(int));`
`877`	`878`
`878`	`879`	`/* We couldn't allocate memory for the IP List. So all we can do is`
`879`	`880`	`* fail. */`