mpi: fix cppcheck warnings

mpi/src/starpu_mpi_datatype.c

@@ -205,7 +205,7 @@ static void _starpu_mpi_handle_free_simple_datatype(MPI_Datatype *datatype)
 
 static void _starpu_mpi_handle_free_complex_datatype(MPI_Datatype *datatype)
 {
-	int num_ints, num_adds, num_datatypes, combiner, i;
+	int num_ints, num_adds, num_datatypes, combiner;
 
 	MPI_Type_get_envelope(*datatype, &num_ints, &num_adds, &num_datatypes, &combiner);
 	if (combiner != MPI_COMBINER_NAMED)
@@ -213,6 +213,7 @@ static void _starpu_mpi_handle_free_complex_datatype(MPI_Datatype *datatype)
 		int *array_of_ints;
 		MPI_Aint *array_of_adds;
 		MPI_Datatype *array_of_datatypes;
+		int i;
 
 		_STARPU_MPI_MALLOC(array_of_ints, num_ints * sizeof(int));
 		_STARPU_MPI_MALLOC(array_of_adds, num_adds * sizeof(MPI_Aint));

mpi/src/starpu_mpi_tag.c

@@ -93,13 +93,14 @@ void _starpu_mpi_data_register_tag(starpu_data_handle_t handle, int tag)
 
 int _starpu_mpi_data_release_tag(starpu_data_handle_t handle)
 {
-	struct handle_tag_entry *tag_entry;
 	int tag = starpu_mpi_data_get_tag(handle);
 
 	_STARPU_MPI_DEBUG(42, "Removing handle %p with tag %d from hashtable\n", handle, tag);
 
 	if (tag != -1)
 	{
+		struct handle_tag_entry *tag_entry;
+
 		_starpu_spin_lock(&registered_tag_handles_lock);
 		HASH_FIND_INT(registered_tag_handles, &(((struct _starpu_mpi_node_tag *)(handle->mpi_data))->data_tag), tag_entry);
 		STARPU_ASSERT_MSG((tag_entry != NULL),"Data handle %p with tag %d isn't in the hashmap !",handle,tag);

mpi/src/starpu_mpi_task_insert.c

@@ -183,7 +183,7 @@ int _starpu_mpi_task_decode_v(struct starpu_codelet *codelet, int me, int nb_nod
 {
 	va_list varg_list_copy;
 	int inconsistent_execute = 0;
-	int arg_type, arg_type_nocommute;
+	int arg_type;
 	int node_selected = 0;
 	int nb_allocated_data = 16;
 	struct starpu_data_descr *descrs;
@@ -200,7 +200,7 @@ int _starpu_mpi_task_decode_v(struct starpu_codelet *codelet, int me, int nb_nod
 	va_copy(varg_list_copy, varg_list);
 	while ((arg_type = va_arg(varg_list_copy, int)) != 0)
 	{
-		arg_type_nocommute = arg_type & ~STARPU_COMMUTE;
+		int arg_type_nocommute = arg_type & ~STARPU_COMMUTE;
 		if (arg_type==STARPU_EXECUTE_ON_NODE)
 		{
 			*xrank = va_arg(varg_list_copy, int);
@@ -434,7 +434,6 @@ int _starpu_mpi_task_decode_v(struct starpu_codelet *codelet, int me, int nb_nod
 static
 int _starpu_mpi_task_build_v(MPI_Comm comm, struct starpu_codelet *codelet, struct starpu_task **task, int *xrank_p, struct starpu_data_descr **descrs_p, int *nb_data_p, va_list varg_list)
 {
-	va_list varg_list_copy;
 	int me, do_execute, xrank, nb_nodes;
 	int ret;
 	int i;
@@ -468,6 +467,7 @@ int _starpu_mpi_task_build_v(MPI_Comm comm, struct starpu_codelet *codelet, stru
 	if (do_execute == 0) return 1;
 	else
 	{
+		va_list varg_list_copy;
 		_STARPU_MPI_DEBUG(100, "Execution of the codelet %p (%s)\n", codelet, codelet?codelet->name:NULL);
 
 		*task = starpu_task_create();

mpi/src/starpu_mpi_task_insert_fortran.c

@@ -29,7 +29,6 @@ int _fstarpu_mpi_task_decode_v(struct starpu_codelet *codelet, int me, int nb_no
 {
 	int arg_i = 0;
 	int inconsistent_execute = 0;
-	int arg_type, arg_type_nocommute;
 	int node_selected = 0;
 	int nb_allocated_data = 16;
 	struct starpu_data_descr *descrs;
@@ -45,8 +44,8 @@ int _fstarpu_mpi_task_decode_v(struct starpu_codelet *codelet, int me, int nb_no
 
 	while (arglist[arg_i] != NULL)
 	{
-		arg_type = (int)(intptr_t)arglist[arg_i];
-		arg_type_nocommute = arg_type & ~STARPU_COMMUTE;
+		int arg_type = (int)(intptr_t)arglist[arg_i];
+		int arg_type_nocommute = arg_type & ~STARPU_COMMUTE;
 
 		if (arg_type==STARPU_EXECUTE_ON_NODE)
 		{

mpi/tests/datatypes.c

@@ -27,7 +27,6 @@ void check_void(starpu_data_handle_t handle_s, starpu_data_handle_t handle_r, in
 
 void check_variable(starpu_data_handle_t handle_s, starpu_data_handle_t handle_r, int *error)
 {
-	int ret;
 	float *v_s, *v_r;
 
 	STARPU_ASSERT(starpu_variable_get_elemsize(handle_s) == starpu_variable_get_elemsize(handle_r));
@@ -48,7 +47,7 @@ void check_variable(starpu_data_handle_t handle_s, starpu_data_handle_t handle_r
 
 void check_vector(starpu_data_handle_t handle_s, starpu_data_handle_t handle_r, int *error)
 {
-	int ret, i;
+	int i;
 	int nx;
 	int *v_r, *v_s;
 

mpi/tests/early_request.c

@@ -134,7 +134,7 @@ void init_element(struct element *el, int size, int foreign_domain)
 	el->tag=size;
 	el->foreign_domain=foreign_domain;
 
-	int mpi_rank, mpi_size;
+	int mpi_rank;
 	starpu_mpi_comm_rank(MPI_COMM_WORLD, &mpi_rank);
 
 	starpu_vector_data_register(&el->recv, 0, (uintptr_t)el->array_recv, size, sizeof(int));

mpi/tests/insert_task_compute.c

@@ -242,7 +242,6 @@ int main(int argc, char **argv)
 		}
 	}
 
-end:
 	MPI_Finalize();
 	return global_ret==-ENODEV?STARPU_TEST_SKIPPED:global_ret;
 }

mpi/tests/policy_register_toomany.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2015  CNRS
+ * Copyright (C) 2015, 2016  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -30,7 +30,7 @@ int starpu_mpi_select_node_my_policy(int me, int nb_nodes, struct starpu_data_de
 int main(int argc, char **argv)
 {
 	int ret;
-	int i, policy;
+	int i;
 
 	ret = starpu_init(NULL);
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
@@ -39,7 +39,7 @@ int main(int argc, char **argv)
 
 	for(i=0 ; i<_STARPU_MPI_NODE_SELECTION_MAX_POLICY+1 ; i++)
 	{
-		policy = starpu_mpi_node_selection_register_policy(starpu_mpi_select_node_my_policy);
+		int policy = starpu_mpi_node_selection_register_policy(starpu_mpi_select_node_my_policy);
 		FPRINTF_MPI(stderr, "New policy %d\n", policy);
 	}
 

mpi/tests/policy_selection2.c

@@ -52,7 +52,6 @@ int main(int argc, char **argv)
 	int ret;
 	int i;
 	int rank, size;
-	struct starpu_task *task;
 	int data[3];
 	starpu_data_handle_t handles[3];
 

mpi/tests/sync.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2015  CNRS
+ * Copyright (C) 2015, 2016  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -19,7 +19,7 @@
 
 int main(int argc, char **argv)
 {
-	int size, n, x=789;
+	int size, x=789;
 	int rank, other_rank;
 	int ret;
 	starpu_data_handle_t data[2];