From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Tue, 13 Jun 2017 15:50:54 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3.16~119
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fd9dfb43196aed35d56c8f1f69de1493f2795c2d?hp=8a714c0ee28c49ac13a74a596238f9fa4bd9f603

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
---

diff --git a/examples/smpi/mc/bugged1_liveness.c b/examples/smpi/mc/bugged1_liveness.c
index 5ec2c2b24a..317eecc530 100644
--- a/examples/smpi/mc/bugged1_liveness.c
+++ b/examples/smpi/mc/bugged1_liveness.c
@@ -24,13 +24,14 @@
 int r, cs;
 
 int main(int argc, char **argv){
-  int err, size, rank;
+  int size;
+  int rank;
   int recv_buff;
   MPI_Status status;
   xbt_dynar_t requests = xbt_dynar_new(sizeof(int), NULL);
 
   /* Initialize MPI */
-  err = MPI_Init(&argc, &argv);
+  int err = MPI_Init(&argc, &argv);
   if(err !=  MPI_SUCCESS){
     printf("MPI initialization failed !\n");
     exit(1);
diff --git a/examples/smpi/mc/bugged2.c b/examples/smpi/mc/bugged2.c
index dd529f8894..d3baebffc5 100644
--- a/examples/smpi/mc/bugged2.c
+++ b/examples/smpi/mc/bugged2.c
@@ -12,11 +12,14 @@
 
 int main(int argc, char **argv)
 {
-  int x,y, err, size, rank;
+  int x;
+  int y;
+  int size;
+  int rank;
   MPI_Status status;
 
   /* Initialize MPI */
-  err = MPI_Init(&argc, &argv);
+  int err = MPI_Init(&argc, &argv);
   if (err != MPI_SUCCESS) {
     printf("MPI initialization failed!\n");
     exit(1);
diff --git a/examples/smpi/mc/mutual_exclusion.c b/examples/smpi/mc/mutual_exclusion.c
index c63b9fd4b6..35f7b82205 100644
--- a/examples/smpi/mc/mutual_exclusion.c
+++ b/examples/smpi/mc/mutual_exclusion.c
@@ -13,14 +13,15 @@
 #define RELEASE_TAG 2
 
 int main(int argc, char **argv){
-  int err, size, rank;
+  int size;
+  int rank;
   int recv_buff;
   MPI_Status status;
   int CS_used = 0;
   xbt_dynar_t requests = xbt_dynar_new(sizeof(int), NULL);
 
   /* Initialize MPI */
-  err = MPI_Init(&argc, &argv);
+  int err = MPI_Init(&argc, &argv);
   if(err !=  MPI_SUCCESS){
     printf("MPI initialization failed !\n");
     exit(1);
diff --git a/examples/smpi/mc/non_termination1.c b/examples/smpi/mc/non_termination1.c
index 24f0593a0c..3ec31a2f33 100644
--- a/examples/smpi/mc/non_termination1.c
+++ b/examples/smpi/mc/non_termination1.c
@@ -6,7 +6,9 @@ int x = 5;
 int y = 8;
 
 int main(int argc, char **argv) {
-  int recv_buff, size, rank;
+  int recv_buff;
+  int size;
+  int rank;
   MPI_Status status;
 
   MPI_Init(&argc, &argv);
diff --git a/examples/smpi/mc/non_termination2.c b/examples/smpi/mc/non_termination2.c
index aafca4d250..60aa0a8bf2 100644
--- a/examples/smpi/mc/non_termination2.c
+++ b/examples/smpi/mc/non_termination2.c
@@ -5,7 +5,9 @@
 int x;
 
 int main(int argc, char **argv) {
-  int recv_buff, size, rank;
+  int recv_buff;
+  int size;
+  int rank;
   MPI_Status status;
 
   MPI_Init(&argc, &argv);
diff --git a/examples/smpi/mc/non_termination3.c b/examples/smpi/mc/non_termination3.c
index efdaa3cf13..0e0f56f349 100644
--- a/examples/smpi/mc/non_termination3.c
+++ b/examples/smpi/mc/non_termination3.c
@@ -6,7 +6,10 @@ int x = 0;
 int y = 0;
 
 int main(int argc, char **argv) {
-  int recv_x, recv_y, size, rank;
+  int recv_x;
+  int recv_y;
+  int size;
+  int rank;
   MPI_Status status;
 
   MPI_Init(&argc, &argv);
diff --git a/examples/smpi/mc/non_termination4.c b/examples/smpi/mc/non_termination4.c
index 5e7add0560..a0792ed812 100644
--- a/examples/smpi/mc/non_termination4.c
+++ b/examples/smpi/mc/non_termination4.c
@@ -5,7 +5,9 @@
 int x = 20;
 
 int main(int argc, char **argv) {
-  int recv_x = 1, size, rank;
+  int recv_x = 1;
+  int size;
+  int rank;
   MPI_Status status;
 
   MPI_Init(&argc, &argv);
diff --git a/examples/smpi/mc/only_send_deterministic.c b/examples/smpi/mc/only_send_deterministic.c
index 01188f1412..8c9108c2dd 100644
--- a/examples/smpi/mc/only_send_deterministic.c
+++ b/examples/smpi/mc/only_send_deterministic.c
@@ -12,11 +12,13 @@
 
 int main(int argc, char **argv)
 {
-  int recv_buff, err, size, rank;
+  int recv_buff;
+  int size;
+  int rank;
   MPI_Status status;
 
   /* Initialize MPI */
-  err = MPI_Init(&argc, &argv);
+  int err = MPI_Init(&argc, &argv);
   if (err != MPI_SUCCESS) {
     printf("MPI initialization failed!\n");
     exit(1);
diff --git a/src/s4u/s4u_file.cpp b/src/s4u/s4u_file.cpp
index e63eba2f63..0f26d5903c 100644
--- a/src/s4u/s4u_file.cpp
+++ b/src/s4u/s4u_file.cpp
@@ -27,6 +27,7 @@ File::File(const char* fullpath, void* userdata) : path_(fullpath), userdata_(us
   storage_type     = xbt_dynar_pop_as(info, char*);
   storageId        = xbt_dynar_pop_as(info, char*);
   mount_point      = xbt_dynar_pop_as(info, char*);
+  xbt_dynar_free(&info);
 }
 
 File::~File() {