Fix warnings about clobbered variables in gras/mmrpc example.

[simgrid.git] / examples / gras / mmrpc / mmrpc_client.c

diff --git a/examples/gras/mmrpc/mmrpc_client.c b/examples/gras/mmrpc/mmrpc_client.c
index ec62e36..e732804 100644 (file)
--- a/examples/gras/mmrpc/mmrpc_client.c
+++ b/examples/gras/mmrpc/mmrpc_client.c
@@ -12,11 +12,24 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(MatMult);
 
-int client(int argc, char *argv[])
+static gras_socket_t try_gras_socket_client(const char *host, int port)
 {
+  volatile gras_socket_t sock = NULL;
   xbt_ex_t e;
+  TRY {
+    sock = gras_socket_client(host, port);
+  }
+  CATCH(e) {
+    if (e.category != system_error)
+      RETHROWF("Unable to connect to the server: %s");
+    xbt_ex_free(e);
+  }
+  return sock;
+}
+
+int client(int argc, char *argv[])
+{
   gras_socket_t toserver = NULL;        /* peer */
-  int connected = 0;
 
   gras_socket_t from;
   xbt_matrix_t request[2], answer;
@@ -37,25 +50,14 @@ int client(int argc, char *argv[])
 
   XBT_INFO("Launch client (server on %s:%d)", host, port);
 
-  /* 3. Create a socket to speak to the server */
-  while (!connected) {
-    TRY {
-      toserver = gras_socket_client(host, port);
-      connected = 1;
-    }
-    CATCH(e) {
-      if (e.category != system_error)
-        RETHROWF("Unable to connect to the server: %s");
-      xbt_ex_free(e);
-      gras_os_sleep(0.05);
-    }
-  }
-  XBT_INFO("Connected to %s:%d.", host, port);
-
-
-  /* 4. Register the messages (before use) */
+  /* 3. Register the messages (before use) */
   mmrpc_register_messages();
 
+  /* 4. Create a socket to speak to the server */
+  while (!(toserver = try_gras_socket_client(host, port)))
+    gras_os_sleep(0.05);
+  XBT_INFO("Connected to %s:%d.", host, port);
+
   /* 5. Keep the user informed of what's going on */
   XBT_INFO(">>>>>>>> Connected to server which is on %s:%d <<<<<<<<",
         gras_socket_peer_name(toserver), gras_socket_peer_port(toserver));