tests: avoid unused var initializers.

By relying on the fact that this codebase targets C99 we can avoid
unused variable initializer warnings by moving some var declarations to
the site of their first use.

3 files changed, 10 insertions, 20 deletions

diff --git a/tests/client.c b/tests/client.c
index 562ccc6..d9121e2 100644
--- a/tests/client.c
+++ b/tests/client.c
@@ -30,7 +30,6 @@ int
 make_conn(const char *hostname, const char *port)
 {
   int sockfd = 0;
-  enum demo_result result = 0;
   struct addrinfo *getaddrinfo_output = NULL, hints;
 
   memset(&hints, 0, sizeof(hints));
@@ -59,7 +58,7 @@ make_conn(const char *hostname, const char *port)
     perror("connecting");
     goto cleanup;
   }
-  result = nonblock(sockfd);
+  enum demo_result result = nonblock(sockfd);
   if(result != DEMO_OK) {
     return 1;
   }
diff --git a/tests/common.c b/tests/common.c
index ab41242..0d13c5f 100644
--- a/tests/common.c
+++ b/tests/common.c
@@ -78,9 +78,8 @@ nonblock(int sockfd)
 int
 read_cb(void *userdata, unsigned char *buf, size_t len, size_t *out_n)
 {
-  ssize_t n = 0;
   struct conndata *conn = (struct conndata *)userdata;
-  n = recv(conn->fd, buf, len, 0);
+  ssize_t n = recv(conn->fd, buf, len, 0);
   if(n < 0) {
     return errno;
   }
@@ -93,10 +92,9 @@ read_cb(void *userdata, unsigned char *buf, size_t len, size_t *out_n)
 int
 write_cb(void *userdata, const unsigned char *buf, size_t len, size_t *out_n)
 {
-  ssize_t n = 0;
   struct conndata *conn = (struct conndata *)userdata;
 
-  n = send(conn->fd, buf, len, 0);
+  ssize_t n = send(conn->fd, buf, len, 0);
   if(n < 0) {
     return errno;
   }
@@ -124,12 +122,11 @@ write_tls(struct rustls_connection *rconn, struct conndata *conn, size_t *n)
 rustls_io_result write_vectored_cb(
     void *userdata, const struct rustls_iovec *iov, size_t count, size_t *out_n)
 {
-  ssize_t n = 0;
   struct conndata *conn = (struct conndata *)userdata;
 
   // safety: narrowing conversion from `size_t count` to `int` is safe because
   // writev return -1 and sets errno to EINVAL on out of range input (<0 || > IOV_MAX).
-  n = writev(conn->fd, (const struct iovec *)iov, (int) count);
+  ssize_t n = writev(conn->fd, (const struct iovec *)iov, (int) count);
   if(n < 0) {
     return errno;
   }
diff --git a/tests/server.c b/tests/server.c
index 43c31ee..6e514ea 100644
--- a/tests/server.c
+++ b/tests/server.c
@@ -42,13 +42,10 @@ typedef enum exchange_state
 enum demo_result
 do_read(struct conndata *conn, struct rustls_connection *rconn)
 {
-  int err = 1;
-  unsigned int result = 1;
   size_t n = 0;
-  ssize_t signed_n = 0;
   char buf[1];
 
-  err = rustls_connection_read_tls(rconn, read_cb, conn, &n);
+  int err = rustls_connection_read_tls(rconn, read_cb, conn, &n);
   if(err == EAGAIN || err == EWOULDBLOCK) {
     fprintf(stderr,
             "server: reading from socket: EAGAIN or EWOULDBLOCK: %s\n",
@@ -65,7 +62,7 @@ do_read(struct conndata *conn, struct rustls_connection *rconn)
   }
   fprintf(stderr, "server: read %zu bytes from socket\n", n);
 
-  result = rustls_connection_process_new_packets(rconn);
+  unsigned int result = rustls_connection_process_new_packets(rconn);
   if(result != RUSTLS_RESULT_OK) {
     print_error("server", "in process_new_packets", result);
     return DEMO_ERROR;
@@ -79,7 +76,7 @@ do_read(struct conndata *conn, struct rustls_connection *rconn)
 
   /* If we got an EOF on the plaintext stream (peer closed connection cleanly),
    * verify that the sender then closed the TCP connection. */
-  signed_n = read(conn->fd, buf, sizeof(buf));
+  ssize_t signed_n = read(conn->fd, buf, sizeof(buf));
   if(signed_n > 0) {
     fprintf(stderr,
             "server: error: read returned %zu bytes after receiving close_notify\n",
@@ -130,8 +127,6 @@ send_response(struct conndata *conn)
 void
 handle_conn(struct conndata *conn)
 {
-  int err = 1;
-  int result = 1;
   fd_set read_fds;
   fd_set write_fds;
   size_t n = 0;
@@ -160,7 +155,7 @@ handle_conn(struct conndata *conn)
     tv.tv_sec = 1;
     tv.tv_usec = 0;
 
-    result = select(sockfd + 1, &read_fds, &write_fds, NULL, &tv);
+    int result = select(sockfd + 1, &read_fds, &write_fds, NULL, &tv);
     if(result == -1) {
       perror("select");
       goto cleanup;
@@ -184,7 +179,7 @@ handle_conn(struct conndata *conn)
       }
     }
     if(FD_ISSET(sockfd, &write_fds)) {
-      err = write_tls(rconn, conn, &n);
+      int err = write_tls(rconn, conn, &n);
       if(err != 0) {
         fprintf(stderr, "server: error in write_tls: errno %d\n", err);
         goto cleanup;
@@ -237,7 +232,6 @@ int
 main(int argc, const char **argv)
 {
   int ret = 1;
-  unsigned int result = 1;
   int sockfd = 0;
   struct rustls_server_config_builder *config_builder =
     rustls_server_config_builder_new();
@@ -345,7 +339,7 @@ main(int argc, const char **argv)
 
     nonblock(clientfd);
 
-    result = rustls_server_connection_new(server_config, &rconn);
+    unsigned int result = rustls_server_connection_new(server_config, &rconn);
     if(result != RUSTLS_RESULT_OK) {
       print_error("server", "making session", result);
       goto cleanup;