tests: removed unused variables and introduced temporal vars in macros

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

diff --git a/tests/eagain-common.h b/tests/eagain-common.h
index 3c269843e22479ad168847d2f1e21e3923dbf502..7ad447634198d56b50cf0215ea6a2f5b3f3023b9 100644 (file)
--- a/tests/eagain-common.h
+++ b/tests/eagain-common.h
@@ -73,87 +73,89 @@ extern const char *side;
 #define HANDSHAKE(c, s) \
   HANDSHAKE_EXPECT(c,s,0,0)
 
-#define TRANSFER2(c, s, msg, msglen, buf, buflen, retry_send_with_null) \
+#define TRANSFER2(c, s, msg, msglen, buf, buflen, retry_send_with_null) { \
+  int _ret; \
   side = "client"; \
-  ret = record_send_loop (c, msg, msglen, retry_send_with_null); \
+  _ret = record_send_loop (c, msg, msglen, retry_send_with_null); \
   \
-  if (ret < 0) fail ("client send error: %s\n", gnutls_strerror (ret)); \
+  if (_ret < 0) fail ("client send error: %s\n", gnutls_strerror (_ret)); \
   \
   do \
     { \
       do \
        { \
          side = "server"; \
-         ret = gnutls_record_recv (s, buf, buflen); \
+         _ret = gnutls_record_recv (s, buf, buflen); \
        } \
-      while(ret == GNUTLS_E_AGAIN); \
-      if (ret == 0) \
+      while(_ret == GNUTLS_E_AGAIN); \
+      if (_ret == 0) \
        fail ("server: didn't receive any data\n"); \
-      else if (ret < 0) \
+      else if (_ret < 0) \
        { \
-         fail ("server: error: %s\n", gnutls_strerror (ret)); \
+         fail ("server: error: %s\n", gnutls_strerror (_ret)); \
        } \
       else \
        { \
-         transferred += ret; \
+         transferred += _ret; \
        } \
       side = "server"; \
-      ret = record_send_loop (server, msg, msglen, retry_send_with_null); \
-      if (ret < 0) fail ("server send error: %s\n", gnutls_strerror (ret)); \
+      _ret = record_send_loop (server, msg, msglen, retry_send_with_null); \
+      if (_ret < 0) fail ("server send error: %s\n", gnutls_strerror (_ret)); \
       do \
        { \
          side = "client"; \
-         ret = gnutls_record_recv (client, buf, buflen); \
+         _ret = gnutls_record_recv (client, buf, buflen); \
        } \
-      while(ret == GNUTLS_E_AGAIN); \
-      if (ret == 0) \
+      while(_ret == GNUTLS_E_AGAIN); \
+      if (_ret == 0) \
        { \
          fail ("client: Peer has closed the TLS connection\n"); \
        } \
-      else if (ret < 0) \
+      else if (_ret < 0) \
        { \
          if (debug) \
            fputs ("!", stdout); \
-         fail ("client: Error: %s\n", gnutls_strerror (ret)); \
+         fail ("client: Error: %s\n", gnutls_strerror (_ret)); \
        } \
       else \
        { \
-         if (msglen != ret || memcmp (buf, msg, msglen) != 0) \
+         if (msglen != _ret || memcmp (buf, msg, msglen) != 0) \
            { \
              fail ("client: Transmitted data do not match\n"); \
            } \
          /* echo back */ \
          side = "client"; \
-         ret = record_send_loop (client, buf, msglen, retry_send_with_null); \
-         if (ret < 0) fail ("client send error: %s\n", gnutls_strerror (ret)); \
-         transferred += ret; \
+         _ret = record_send_loop (client, buf, msglen, retry_send_with_null); \
+         if (_ret < 0) fail ("client send error: %s\n", gnutls_strerror (_ret)); \
+         transferred += _ret; \
          if (debug) \
            fputs (".", stdout); \
        } \
     } \
-  while (transferred < 70000)
+  while (transferred < 70000); \
+  }
 
 #define EMPTY_BUF(s, c, buf, buflen) \
     { \
-      side = "client"; ret = 0; \
-      while((ret == GNUTLS_E_AGAIN && to_server_len > 0) || to_server_len > 0) \
+      side = "client"; int _ret = 0; \
+      while((_ret == GNUTLS_E_AGAIN && to_server_len > 0) || to_server_len > 0) \
        { \
          side = "server"; \
-         ret = gnutls_record_recv (s, buf, buflen); \
+         _ret = gnutls_record_recv (s, buf, buflen); \
        } \
-      if (ret < 0 && ret !=GNUTLS_E_AGAIN) \
+      if (_ret < 0 && _ret !=GNUTLS_E_AGAIN) \
        { \
-         fail ("server: error: %s\n", gnutls_strerror (ret)); \
+         fail ("server: error: %s\n", gnutls_strerror (_ret)); \
        } \
-      side = "server"; ret = 0; \
-      while((to_client_len > 0 && ret == GNUTLS_E_AGAIN) || to_client_len > 0) \
+      side = "server"; _ret = 0; \
+      while((to_client_len > 0 && _ret == GNUTLS_E_AGAIN) || to_client_len > 0) \
        { \
          side = "client"; \
-         ret = gnutls_record_recv (client, buf, buflen); \
+         _ret = gnutls_record_recv (client, buf, buflen); \
        } \
-      if (ret < 0 && ret !=GNUTLS_E_AGAIN) \
+      if (_ret < 0 && _ret !=GNUTLS_E_AGAIN) \
        { \
-         fail ("client: Error: %s\n", gnutls_strerror (ret)); \
+         fail ("client: Error: %s\n", gnutls_strerror (_ret)); \
        } \
     }
 

diff --git a/tests/mini-eagain-dtls.c b/tests/mini-eagain-dtls.c
index c3654f9e1986c1977dbb6babac2d12ffc97d2c38..594d49d015d5167206b0ad92e7e963b3ebd37a86 100644 (file)
--- a/tests/mini-eagain-dtls.c
+++ b/tests/mini-eagain-dtls.c
@@ -59,7 +59,6 @@ void doit(void)
        gnutls_session_t client;
        /* Need to enable anonymous KX specifically. */
        char buffer[MAX_BUF + 1];
-       ssize_t ns;
        int ret, transferred = 0, msglen;
 
        /* General init. */
@@ -116,7 +115,6 @@ void doit(void)
                ret = gnutls_record_send(client, MSG, strlen(MSG));
        }
        while (ret == GNUTLS_E_AGAIN);
-       //success ("client: sent %d\n", ns);
 
        msglen = strlen(MSG);
        TRANSFER(client, server, MSG, msglen, buffer, MAX_BUF);

diff --git a/tests/mini-eagain.c b/tests/mini-eagain.c
index 124b535103f04c8f3d637feea0abc4490cb1e764..d240ed6a011612b861de1bc78e180e2f5880826a 100644 (file)
--- a/tests/mini-eagain.c
+++ b/tests/mini-eagain.c
@@ -61,7 +61,6 @@ void doit(void)
        gnutls_session_t client;
        /* Need to enable anonymous KX specifically. */
        char buffer[MAX_BUF + 1];
-       ssize_t ns;
        int ret, transferred = 0, msglen;
 
        /* General init. */

diff --git a/tests/mini-emsgsize-dtls.c b/tests/mini-emsgsize-dtls.c
index 0d4a1e444301bc9d93e64815626352aefaea1145..af2737ad2d001bdd985fedfcda75ff1da89c16ea 100644 (file)
--- a/tests/mini-emsgsize-dtls.c
+++ b/tests/mini-emsgsize-dtls.c
@@ -108,7 +108,6 @@ void doit(void)
        gnutls_session_t client;
        /* Need to enable anonymous KX specifically. */
        char buffer[MAX_BUF + 1];
-       ssize_t ns;
        int ret, transferred = 0, msglen;
 
        /* General init. */
@@ -170,7 +169,6 @@ void doit(void)
                ret = gnutls_record_send(client, MSG, strlen(MSG));
        }
        while (ret == GNUTLS_E_AGAIN);
-       //success ("client: sent %d\n", ns);
 
        msglen = strlen(MSG);
        TRANSFER(client, server, MSG, msglen, buffer, MAX_BUF);

diff --git a/tests/record-sizes.c b/tests/record-sizes.c
index 7e8efbc756b7de721f536ea35e413df54ab47288..be5b20a84ebd820b2ba90617dca722b71a9ff141 100644 (file)
--- a/tests/record-sizes.c
+++ b/tests/record-sizes.c
@@ -61,7 +61,6 @@ void doit(void)
        gnutls_session_t client;
        int cret = GNUTLS_E_AGAIN, i;
        /* Need to enable anonymous KX specifically. */
-       ssize_t ns;
        int ret, transferred = 0;
 
        if (gnutls_fips140_mode_enabled()) {

diff --git a/tests/record-timeouts.c b/tests/record-timeouts.c
index b9c24248dc40b57926ad454f84d1fba0b68991c4..9e82c460f2688716158b4e2508efbd1f224ad3b9 100644 (file)
--- a/tests/record-timeouts.c
+++ b/tests/record-timeouts.c
@@ -79,8 +79,7 @@ void doit(void)
        gnutls_session_t client;
        int cret = GNUTLS_E_AGAIN, i;
        /* Need to enable anonymous KX specifically. */
-       ssize_t ns;
-       int ret, transferred = 0;
+       int transferred = 0;
 
        /* General init. */
        global_init();

diff --git a/tests/tls13-rehandshake-cert.c b/tests/tls13-rehandshake-cert.c
index 04db8805ad9a147d140932d2cc8d14c2dae723c5..8ef00edd6e82f1298feef5a9be6fda7ef90a6a80 100644 (file)
--- a/tests/tls13-rehandshake-cert.c
+++ b/tests/tls13-rehandshake-cert.c
@@ -56,7 +56,6 @@ void server_initiated_handshake(void)
        gnutls_session_t client;
        unsigned char buffer[64];
        int cret = GNUTLS_E_AGAIN;
-       int ret;
        size_t transferred = 0;
 
        success("testing server initiated re-handshake\n");
@@ -140,7 +139,6 @@ void client_initiated_handshake(void)
        gnutls_session_t client;
        unsigned char buffer[64];
        int cret = GNUTLS_E_AGAIN;
-       int ret;
        size_t transferred = 0;
 
        success("testing client initiated re-handshake\n");

diff --git a/tests/tls13/key_update.c b/tests/tls13/key_update.c
index 1e54fc4bc1049dcd073fbac5d7acd7e76269a191..dd1a559d86348f6df2982f4dba28a4e80162d801 100644 (file)
--- a/tests/tls13/key_update.c
+++ b/tests/tls13/key_update.c
@@ -57,7 +57,6 @@ static void run(const char *name, unsigned test)
        gnutls_session_t client;
        /* Need to enable anonymous KX specifically. */
        char buffer[MAX_BUF + 1];
-       ssize_t ns;
        int ret, transferred = 0;
 
        /* General init. */