From 0a20ac33156b4978352223e461c77194f75fe814 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 28 Jul 2013 12:11:23 +0200
Subject: [PATCH] Minor code cleanup.

---
 src/connection.c |  6 ++----
 src/tlsproxy.c   | 22 ++++++++--------------
 tests/client.c   |  2 +-
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/connection.c b/src/connection.c
index e053df2..365eaab 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -625,9 +625,8 @@ static int read_from_write_to(int from, int to) {
     if (size_read < 0) {
         LOG_PERROR(LOG_WARNING, "read_from_write_to(): read()");
         return -1;
-    }
     /* EOF */
-    if (size_read == 0) {
+    } else if (size_read == 0) {
         return -1;
     }
 
@@ -722,9 +721,8 @@ static int read_from_write_to_tls(gnutls_session_t from,
         LOG(LOG_WARNING, "read_from_write_to_tls(): gnutls_record_recv(): %s",
                          gnutls_strerror((int)size_read));
         return -1;
-    }
     /* EOF */
-    if (size_read == 0) {
+    } else if (size_read == 0) {
         return -1;
     }
 
diff --git a/src/tlsproxy.c b/src/tlsproxy.c
index 77c6d02..0f3481e 100644
--- a/src/tlsproxy.c
+++ b/src/tlsproxy.c
@@ -136,19 +136,13 @@ int main(int argc, char **argv) {
         return EXIT_FAILURE;
     }
     for (i = 0; i < thread_count; i++) {
-        int result;
-        pthread_t thread;
-
-        result = pthread_create(&thread, NULL,
+        errno = pthread_create(threads + i, NULL,
                                 (void * (*)(void *))&worker_thread,
                                 NULL);
-        if (result != 0) {
-            fprintf(stderr, "failed to create worker thread: %s\n",
-                            strerror(result));
+        if (errno != 0) {
+            perror("failed to create worker thread");
             return EXIT_FAILURE;
         }
-
-        threads[i] = thread;
     }
 
 #ifdef USE_IPV4_ONLY
@@ -268,13 +262,13 @@ static void parse_arguments(int argc, char **argv) {
     while ((option = getopt(argc, argv, "d:p:t:uh?")) != -1) {
         switch (option) {
             case 'd': {
-                if (atoi(optarg) < 0) {
+                global_log_level = atoi(optarg);
+                if (global_log_level < 0) {
                     print_usage(argv[0]);
                     fprintf(stderr, "\n-d positive number required: '%s'\n",
                                     optarg);
                     exit(EXIT_FAILURE);
                 }
-                global_log_level = atoi(optarg);
                 break;
             }
             case 'p': {
@@ -352,18 +346,18 @@ static void print_usage(const char *argv) {
 
 static void initialize_gnutls(void) {
     int result;
-    gcry_error_t error = 0;
+    gcry_error_t error;
 
     /* Thread safe setup. Must be called before gnutls_global_init(). */
     error = gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
-    if (error) {
+    if (error != 0) {
         fprintf(stderr, "gcry_control(): %s/%s\n", gcry_strsource(error),
                                                    gcry_strerror(error));
         exit(EXIT_FAILURE);
     }
     /* Prevent usage of blocking /dev/random. */
     error = gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM, 0);
-    if (error) {
+    if (error != 0) {
         fprintf(stderr, "gcry_control(): %s/%s\n", gcry_strsource(error),
                                                    gcry_strerror(error));
         exit(EXIT_FAILURE);
diff --git a/tests/client.c b/tests/client.c
index 9bb23f3..c11684d 100644
--- a/tests/client.c
+++ b/tests/client.c
@@ -235,7 +235,7 @@ static int read_http_request(FILE *client_fd, char *request, size_t length) {
         return -2;
     }
 
-    while (fgets(buffer, MAX_REQUEST_LINE, client_fd) != NULL) {
+    while (fgets(buffer, sizeof(buffer), client_fd) != NULL) {
         /* End of header. */
         if (!strcmp(buffer, "\n") || !strcmp(buffer, "\r\n")) {
             break;
-- 
2.43.2