From 83fcc7ddb42a5f48f9e767407793221c0b86b77e Mon Sep 17 00:00:00 2001
From: Shane Israel <shanemisrael@gmail.com>
Date: Mon, 30 Jun 2014 11:10:03 -0600
Subject: [PATCH] Fixed clang warnings

---
 tls/server-tcp.c             |  4 ++--
 tls/server-tls-nonblocking.c | 11 +++++------
 tls/server-tls-threaded.c    |  4 ++--
 tls/server-tls.c             |  8 ++++----
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/tls/server-tcp.c b/tls/server-tcp.c
index bce1b29a..4fb7a560 100644
--- a/tls/server-tcp.c
+++ b/tls/server-tcp.c
@@ -39,7 +39,7 @@ int AcceptAndRead(socklen_t sockfd);
 int AcceptAndRead(socklen_t sockfd)
 {
     struct sockaddr_in clientAddr;
- 	int size = sizeof(clientAddr);
+ 	socklen_t size = sizeof(clientAddr);
     int ret  = 0;
 
     /* Wait until a client connects */
@@ -99,7 +99,7 @@ int main()
     int exit   = 0; 	/* 0 = false, 1 = true */
 
     /* If positive value, the socket is valid */
-    if(sockfd < 0){
+    if(sockfd == -1){
         printf("ERROR: failed to create the socket\n");
         return 1;        /* Kill the server with exit status 1 */        
     }
diff --git a/tls/server-tls-nonblocking.c b/tls/server-tls-nonblocking.c
index 31e4d976..d88c04df 100644
--- a/tls/server-tls-nonblocking.c
+++ b/tls/server-tls-nonblocking.c
@@ -146,11 +146,10 @@ int NonBlocking_ReadWriteAccept(CYASSL* ssl, socklen_t socketfd,
 
 int AcceptAndRead(CYASSL_CTX* ctx, socklen_t socketfd, struct sockaddr_in clientAddr)
 {
-    int     size = sizeof(clientAddr);
-    CYASSL* ssl;
+    socklen_t     size = sizeof(clientAddr);
 
     /* Wait until a client connects */
-    int connd = accept(socketfd, (struct sockaddr_in *)&clientAddr, &size);
+    int connd = accept(socketfd, (struct sockaddr *)&clientAddr, &size);
 
     /* If fails to connect, loop back up and wait for a new connection */
     if (connd == -1) {
@@ -159,7 +158,7 @@ int AcceptAndRead(CYASSL_CTX* ctx, socklen_t socketfd, struct sockaddr_in client
     /* If it connects, read in and reply to the client */
     else {
         printf("Client connected successfully!\n");
-
+        CYASSL* ssl;
         if ( (ssl = CyaSSL_new(ctx)) == NULL) {
             fprintf(stderr, "CyaSSL_new error.\n");
             exit(EXIT_FAILURE);
@@ -184,8 +183,8 @@ int AcceptAndRead(CYASSL_CTX* ctx, socklen_t socketfd, struct sockaddr_in client
             if (NonBlocking_ReadWriteAccept(ssl, socketfd, WRITE) == 0)
                 break;
         }
+        CyaSSL_free(ssl);           /* Free the CYASSL object */
     } 
-    CyaSSL_free(ssl);           /* Free the CYASSL object */
     close(connd);               /* close the connected socket */
 
     return 0;
@@ -224,7 +223,7 @@ int main()
     socklen_t len = sizeof(on);
 
     /* If positive value, the socket is valid */
-    if (socketfd < 0) {
+    if (socketfd == -1) {
         printf("ERROR: failed to create the socket\n");
         exit(EXIT_FAILURE);        /* Kill the server with exit status 1 */
     }
diff --git a/tls/server-tls-threaded.c b/tls/server-tls-threaded.c
index 9780dd3e..98a1168b 100644
--- a/tls/server-tls-threaded.c
+++ b/tls/server-tls-threaded.c
@@ -100,7 +100,7 @@ void *ThreadHandler(void* socketDesc)
 
 int AcceptAndRead(socklen_t sockfd, struct sockaddr_in clientAddr)
 {
-    int size = sizeof(clientAddr);
+    socklen_t size = sizeof(clientAddr);
     int connd;      /* Identify and access the clients connection */
 
     pthread_t thread_id;
@@ -149,7 +149,7 @@ int main()
     CyaSSL_Init();
 
     /* If positive value, the socket is valid */
-    if (sockfd < 0) {
+    if (sockfd == -1) {
         printf("ERROR: failed to create the socket\n");
         return EXIT_FAILURE;        
     }
diff --git a/tls/server-tls.c b/tls/server-tls.c
index 6d306615..5ad4483a 100644
--- a/tls/server-tls.c
+++ b/tls/server-tls.c
@@ -46,8 +46,7 @@ int AcceptAndRead(CYASSL_CTX* ctx, socklen_t sockfd, struct sockaddr_in
 {
         /* Create our reply message */
     const char reply[]  = "I hear ya fa shizzle!\n";
-    int         size    = sizeof(clientAddr);
-    CYASSL*     ssl;
+    socklen_t         size    = sizeof(clientAddr);
 
     /* Wait until a client connects */
     int connd = accept(sockfd, (struct sockaddr *)&clientAddr, &size);
@@ -59,6 +58,7 @@ int AcceptAndRead(CYASSL_CTX* ctx, socklen_t sockfd, struct sockaddr_in
     /* If it connects, read in and reply to the client */
     else {
         printf("Client connected successfully\n");
+        CYASSL*     ssl;
 
         if ( (ssl = CyaSSL_new(ctx)) == NULL) {
             fprintf(stderr, "CyaSSL_new error.\n");
@@ -101,8 +101,8 @@ int AcceptAndRead(CYASSL_CTX* ctx, socklen_t sockfd, struct sockaddr_in
                 break;
             }
         }
+        CyaSSL_free(ssl);           /* Free the CYASSL object */
     }
-    CyaSSL_free(ssl);           /* Free the CYASSL object */
     close(connd);               /* close the connected socket */
 
     return 0;
@@ -129,7 +129,7 @@ int main()
     CyaSSL_Init();
 
     /* If positive value, the socket is valid */
-    if (sockfd < 0) {
+    if (sockfd == -1) {
         printf("ERROR: failed to create the socket\n");
         return EXIT_FAILURE;        /* Kill the server with exit status 1 */        
     }