From d2f19f87ea9f58ec528396689a5fb886e5692a80 Mon Sep 17 00:00:00 2001
From: suter <frederic.suter@cc.in2p3.fr>
Date: Mon, 10 Jun 2013 09:11:33 +0200
Subject: [PATCH] avoid double variable definition when tracing is activated
 (+some indenting)

---
 src/smpi/smpi_replay.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/smpi/smpi_replay.c b/src/smpi/smpi_replay.c
index 9dcf47bf13..5991906ea4 100644
--- a/src/smpi/smpi_replay.c
+++ b/src/smpi/smpi_replay.c
@@ -558,11 +558,10 @@ static void action_gather(const char *const *action) {
   int root=atoi(action[4]);
   int rank = smpi_process_index();
 
-  if(rank==root) recv = calloc(recv_size*comm_size, smpi_datatype_size(MPI_CURRENT_TYPE2));  
+  if(rank==root)
+    recv = calloc(recv_size*comm_size, smpi_datatype_size(MPI_CURRENT_TYPE2));
 
-   
 #ifdef HAVE_TRACING
-  int rank = smpi_process_index();
   TRACE_smpi_computing_out(rank);
   TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
 #endif
@@ -606,21 +605,23 @@ static void action_reducescatter(const char *const *action) {
   int root=0;
   int rank = smpi_process_index();
 
-  if(action[3+comm_size]) MPI_CURRENT_TYPE=decode_datatype(action[3+comm_size]);
-  else MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
+  if(action[3+comm_size])
+    MPI_CURRENT_TYPE=decode_datatype(action[3+comm_size]);
+  else
+    MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
 
   for(i=0;i<comm_size;i++) {
     recvcounts[i] = atoi(action[i+2]);
     recv_sum=recv_sum+recvcounts[i];
     disps[i] = 0;
   }
- 
+
 #ifdef HAVE_TRACING
-  int rank = smpi_process_index();
   TRACE_smpi_computing_out(rank);
   TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
 #endif
-   mpi_coll_reduce_fun(NULL, NULL, recv_sum, MPI_CURRENT_TYPE, MPI_OP_NULL, root, MPI_COMM_WORLD);
+   mpi_coll_reduce_fun(NULL, NULL, recv_sum, MPI_CURRENT_TYPE, MPI_OP_NULL,
+       root, MPI_COMM_WORLD);
    smpi_mpi_scatterv(NULL, recvcounts, disps, MPI_CURRENT_TYPE, NULL,
                       recvcounts[rank], MPI_CURRENT_TYPE, 0, MPI_COMM_WORLD);
    smpi_execute_flops(comp_size);
-- 
2.20.1