Selaa lähdekoodia

Fix -Wextra warnings, enable them by default

Samuel Thibault 4 vuotta sitten
vanhempi
commit
ab841813c6

+ 2 - 1
configure.ac

@@ -2257,9 +2257,10 @@ if test x$enable_perf_debug = xyes; then
 	IS_SUPPORTED_FLAG(-fno-pie)
 fi
 
+IS_SUPPORTED_FLAG(-Wextra)
+
 if test "x$STARPU_DEVEL" != x; then
 	AC_DEFINE(STARPU_DEVEL, [1], [enable developer warnings])
-	IS_SUPPORTED_FLAG(-Wextra)
 	IS_SUPPORTED_FLAG(-Wunused)
 	IS_SUPPORTED_CFLAG(-Wundef)
 	IS_SUPPORTED_CXXFLAG(-Wundef)

+ 2 - 2
examples/cg/cg.c

@@ -258,12 +258,12 @@ static void display_matrix(void)
 
 static void display_x_result(void)
 {
-	int j, i;
+	unsigned j, i;
 	starpu_data_handle_t sub;
 
 	FPRINTF(stderr, "Computed X vector:\n");
 
-	int block_size = n / nblocks;
+	unsigned block_size = n / nblocks;
 
 	for (j = 0; j < nblocks; j++)
 	{

+ 1 - 1
examples/cg/cg_kernels.c

@@ -31,7 +31,7 @@ static const TYPE gm1 = -1.0;
 
 #define FPRINTF(ofile, fmt, ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ## __VA_ARGS__); }} while(0)
 
-static int nblocks = 8;
+static unsigned nblocks = 8;
 
 #ifdef STARPU_QUICK_CHECK
 static int i_max = 5;

+ 6 - 4
mpi/examples/cg/cg.c

@@ -39,7 +39,7 @@ static int copy_handle(starpu_data_handle_t* dst, starpu_data_handle_t* src, uns
 #define BARRIER() starpu_mpi_barrier(MPI_COMM_WORLD);
 #define GET_DATA_HANDLE(handle) starpu_mpi_get_data_on_all_nodes_detached(MPI_COMM_WORLD, handle)
 
-static int block_size;
+static unsigned block_size;
 
 static int rank;
 static int nodes_p = 2;
@@ -82,7 +82,8 @@ static int copy_handle(starpu_data_handle_t* dst, starpu_data_handle_t* src, uns
  */
 static void generate_random_problem(void)
 {
-	unsigned nn, mm, m, n, mpi_rank;
+	unsigned nn, mm, m, n;
+	int mpi_rank;
 
 	A = malloc(nblocks * sizeof(TYPE **));
 	x = malloc(nblocks * sizeof(TYPE *));
@@ -142,7 +143,8 @@ static void generate_random_problem(void)
 
 static void free_data(void)
 {
-	unsigned nn, mm, m, n, mpi_rank;
+	unsigned nn, mm, m, n;
+	int mpi_rank;
 
 	for (m = 0; m < nblocks; m++)
 	{
@@ -304,7 +306,7 @@ static void unregister_data(void)
 
 static void display_x_result(void)
 {
-	int j, i;
+	unsigned j, i;
 
 	for (j = 0; j < nblocks; j++)
 	{

+ 1 - 1
src/datawizard/interfaces/bcsr_filters.c

@@ -91,7 +91,7 @@ void starpu_bcsr_filter_canonical_block(void *father_interface, void *child_inte
 	}
 }
 
-unsigned starpu_bcsr_filter_canonical_block_get_nchildren(struct starpu_data_filter *f, starpu_data_handle_t handle)
+unsigned starpu_bcsr_filter_canonical_block_get_nchildren(STARPU_ATTRIBUTE_UNUSED struct starpu_data_filter *f, starpu_data_handle_t handle)
 {
   return (unsigned)starpu_bcsr_get_nnz(handle);
 }