Use better readable order of arguments in if.

[tlsproxy/tlsproxy.git] / src / tlsproxy.c

diff --git a/src/tlsproxy.c b/src/tlsproxy.c
index 4bfc88d4f786ce68f21502e727bfbe6afcc00445..1e8642fa4ca4e40d93879e058bffb974bc402a8e 100644 (file)
--- a/src/tlsproxy.c
+++ b/src/tlsproxy.c
@@ -52,7 +52,7 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
 
 /* For gnutls_*() functions. */
 #define GNUTLS_ERROR_EXIT(error, message) \
-    if (GNUTLS_E_SUCCESS != error) { \
+    if (error != GNUTLS_E_SUCCESS) { \
         fprintf(stderr, "%s: %s\n", message, gnutls_strerror(error)); \
         exit(EXIT_FAILURE); \
     }
@@ -103,7 +103,7 @@ int main(int argc, char **argv) {
     parse_arguments(argc, argv);
 
     port = atoi(argv[argc - 1]);
-    if (0 >= port || 0xffff < port) {
+    if (port <= 0 || port > 0xffff ) {
         print_usage(argv[0]);
         fprintf(stderr, "\ninvalid port: '%s'\n", argv[argc - 1]);
         return EXIT_FAILURE;
@@ -138,7 +138,7 @@ int main(int argc, char **argv) {
 
     /* Spawn worker threads to handle requests. */
     threads = malloc(thread_count * sizeof(*threads));
-    if (NULL == threads) {
+    if (threads == NULL) {
         perror("thread malloc failed");
         return EXIT_FAILURE;
     }
@@ -149,7 +149,7 @@ int main(int argc, char **argv) {
         result = pthread_create(&thread, NULL,
                                 (void * (*)(void *))&worker_thread,
                                 NULL);
-        if (0 != result) {
+        if (result != 0) {
             fprintf(stderr, "failed to create worker thread: %s\n",
                             strerror(result));
             return EXIT_FAILURE;
@@ -163,13 +163,13 @@ int main(int argc, char **argv) {
 #else
     server_socket = socket(PF_INET6, SOCK_STREAM, 0);
 #endif
-    if (-1 == server_socket) {
+    if (server_socket == -1) {
         perror("socket()");
         return EXIT_FAILURE;
     }
 
     /* Fast rebinding for debug mode, could cause invalid packets. */
-    if (LOG_DEBUG_LEVEL <= global_log_level) {
+    if (global_log_level >= LOG_DEBUG_LEVEL) {
         int socket_option = 1;
         setsockopt(server_socket, SOL_SOCKET, SO_REUSEADDR,
                    &socket_option, sizeof(socket_option));
@@ -186,22 +186,22 @@ int main(int argc, char **argv) {
     server_in.sin6_addr   = in6addr_any;           /* bind to any address */
     server_in.sin6_port   = htons((uint16_t)port); /* port to bind to */
 #endif
-    if (-1 == bind(server_socket, (struct sockaddr *)&server_in,
-                                  sizeof(server_in))) {
+    if (bind(server_socket, (struct sockaddr *)&server_in,
+                            sizeof(server_in)) == -1) {
         perror("bind()");
         return EXIT_FAILURE;
     }
     /* And accept connections. */
-    if (-1 == listen(server_socket, 5)) {
+    if (listen(server_socket, 5) == -1) {
         perror("listen()");
         return EXIT_FAILURE;
     }
 
-    if (LOG_DEBUG_LEVEL <= global_log_level) {
+    if (global_log_level >= LOG_DEBUG_LEVEL) {
         printf("tlsproxy %s\n", VERSION);
         printf("Listening for connections on port %d.\n", port);
 
-        if (NULL != global_proxy_host && NULL != global_proxy_port) {
+        if (global_proxy_host != NULL && global_proxy_port != NULL) {
             printf("Using proxy: %s:%s.\n", global_proxy_host,
                                             global_proxy_port);
         }
@@ -210,7 +210,7 @@ int main(int argc, char **argv) {
     while (!done) {
         /* Accept new connection. */
         client_socket = accept(server_socket, NULL, NULL);
-        if (-1 == client_socket) {
+        if (client_socket == -1) {
             perror("accept()");
             break;
         }
@@ -233,7 +233,7 @@ int main(int argc, char **argv) {
     }
     for (i = 0; i < thread_count; i++) {
         errno = pthread_join(threads[i], NULL);
-        if (0 != errno) {
+        if (errno != 0) {
             perror("pthread_join()");
         }
     }
@@ -272,10 +272,10 @@ static void parse_arguments(int argc, char **argv) {
 #endif
     global_passthrough_unknown = 0;
 
-    while (-1 != (option = getopt(argc, argv, "d:p:t:uh?"))) {
+    while ((option = getopt(argc, argv, "d:p:t:uh?")) != -1) {
         switch (option) {
             case 'd': {
-                if (0 > atoi(optarg)) {
+                if (atoi(optarg) < 0) {
                     print_usage(argv[0]);
                     fprintf(stderr, "\n-d positive number required: '%s'\n",
                                     optarg);
@@ -288,11 +288,11 @@ static void parse_arguments(int argc, char **argv) {
                 char *position;
 
                 /* -p must have the format host:port. */
-                if (NULL == (position = strchr(optarg, ':'))
-                        || position == optarg
-                        || 0 == strlen(position + 1)
-                        || 0 >= atoi(position + 1)
-                        || 0xffff < atoi(position + 1)) {
+                if ((position = strchr(optarg, ':')) == NULL
+                        || optarg == position
+                        || strlen(position + 1) == 0
+                        || atoi(position + 1) <= 0
+                        || atoi(position + 1) > 0xffff) {
                     print_usage(argv[0]);
                     fprintf(stderr, "\ninvalid -p: '%s', format host:port\n",
                             optarg);
@@ -300,7 +300,7 @@ static void parse_arguments(int argc, char **argv) {
                 }
 
                 global_proxy_host = malloc((size_t)(position - optarg) + 1);
-                if (NULL == global_proxy_host) {
+                if (global_proxy_host == NULL) {
                     perror("malloc()");
                     exit(EXIT_FAILURE);
                 }
@@ -308,7 +308,7 @@ static void parse_arguments(int argc, char **argv) {
                 global_proxy_host[position - optarg] = '\0';
 
                 global_proxy_port = malloc(strlen(position + 1) + 1);
-                if (NULL == global_proxy_port) {
+                if (global_proxy_port == NULL) {
                     perror("malloc()");
                     exit(EXIT_FAILURE);
                 }
@@ -317,7 +317,7 @@ static void parse_arguments(int argc, char **argv) {
                 break;
             }
             case 't': {
-                if (0 >= atoi(optarg)) {
+                if (atoi(optarg) <= 0) {
                     print_usage(argv[0]);
                     fprintf(stderr, "\n-t positive number required: '%s'\n",
                                     optarg);
@@ -410,7 +410,7 @@ static void worker_thread(void) {
         V(ringbuffer_free);
 
         /* Negative value indicates we should shut down our thread. */
-        if (0 > client_socket) {
+        if (client_socket < 0) {
             break;
         }