From 4b50558aabf14cf248cc681c265b43bb1ab9cf3d Mon Sep 17 00:00:00 2001
From: degomme <augustin.degomme@unibas.ch>
Date: Sun, 12 Feb 2017 02:04:41 +0100
Subject: [PATCH] please clang

---
 src/smpi/colls/bcast-scatter-rdb-allgather.c       | 2 +-
 teshsuite/smpi/isp/umpire/any_src-wait-deadlock2.c | 1 -
 teshsuite/smpi/isp/umpire/no-error-test.c          | 1 -
 teshsuite/smpi/mpich3-test/coll/bcastzerotype.c    | 2 +-
 teshsuite/smpi/mpich3-test/coll/testlist           | 2 +-
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/smpi/colls/bcast-scatter-rdb-allgather.c b/src/smpi/colls/bcast-scatter-rdb-allgather.c
index 32a1fdb2cf..d4f8cab05e 100644
--- a/src/smpi/colls/bcast-scatter-rdb-allgather.c
+++ b/src/smpi/colls/bcast-scatter-rdb-allgather.c
@@ -107,7 +107,7 @@ smpi_coll_tuned_bcast_scatter_rdb_allgather (
     int mpi_errno = MPI_SUCCESS;
     int scatter_size, curr_size, recv_size = 0;
     int j, k, i, tmp_mask, is_contig, is_homogeneous;
-    MPI_Aint type_size, nbytes = 0;
+    MPI_Aint type_size = 0, nbytes = 0;
     int relative_dst, dst_tree_root, my_tree_root, send_offset;
     int recv_offset, tree_root, nprocs_completed, offset;
     int position;
diff --git a/teshsuite/smpi/isp/umpire/any_src-wait-deadlock2.c b/teshsuite/smpi/isp/umpire/any_src-wait-deadlock2.c
index e3503a13b9..6112e1235f 100644
--- a/teshsuite/smpi/isp/umpire/any_src-wait-deadlock2.c
+++ b/teshsuite/smpi/isp/umpire/any_src-wait-deadlock2.c
@@ -16,7 +16,6 @@ main (int argc, char **argv)
   int namelen = 128;
   int buf0[buf_size];
   int buf1[buf_size];
-  int i;
   MPI_Status status;
   MPI_Request req;
 
diff --git a/teshsuite/smpi/isp/umpire/no-error-test.c b/teshsuite/smpi/isp/umpire/no-error-test.c
index 7a87685061..05b03c8280 100644
--- a/teshsuite/smpi/isp/umpire/no-error-test.c
+++ b/teshsuite/smpi/isp/umpire/no-error-test.c
@@ -19,7 +19,6 @@ main (int argc, char **argv)
   int flag = 0;
   MPI_Status status;
   MPI_Request req;
-	int i;
   /* init */
   MPI_Init (&argc, &argv);
   MPI_Comm_size (MPI_COMM_WORLD, &nprocs);
diff --git a/teshsuite/smpi/mpich3-test/coll/bcastzerotype.c b/teshsuite/smpi/mpich3-test/coll/bcastzerotype.c
index d6716d4de7..d4a4956cbd 100644
--- a/teshsuite/smpi/mpich3-test/coll/bcastzerotype.c
+++ b/teshsuite/smpi/mpich3-test/coll/bcastzerotype.c
@@ -27,7 +27,7 @@ int main(int argc, char *argv[])
     /* a random non-zero sized buffer */
 #define NELEM (10)
     buf = malloc(NELEM * sizeof(int));
-    assert(buf);
+    assert(buf!=NULL);
 
     for (i = 0; i < NELEM; i++) {
         buf[i] = wrank * NELEM + i;
diff --git a/teshsuite/smpi/mpich3-test/coll/testlist b/teshsuite/smpi/mpich3-test/coll/testlist
index 6158b7a2f9..a3ac761539 100644
--- a/teshsuite/smpi/mpich3-test/coll/testlist
+++ b/teshsuite/smpi/mpich3-test/coll/testlist
@@ -12,7 +12,7 @@ allred6 7
 reduce_mpich 5
 reduce_mpich 10
 reduce_local 2 mpiversion=2.2
-op_commutative 2
+#op_commutative 2
 red3 10
 red4 10
 alltoall1 8
-- 
2.20.1