Fix some warnings

1 files changed, 8 insertions, 10 deletions

diff --git a/client.c b/client.c
index bfcab14..f812a02 100644
--- a/client.c
+++ b/client.c
@@ -23,7 +23,7 @@ int bind_sockfd;
 
 fd_set client_master_fdset;
 
-int handle_pong_frame(protocol_frame *rcvd_frame)
+int handle_pong_frame()
 {
     struct timespec pong_rcvd_time;
     double secs1, secs2;
@@ -175,7 +175,6 @@ int handle_server_tcp_frame(protocol_frame *rcvd_frame)
     while(offset < rcvd_frame->data_length)
     {
         int sent_bytes;
-        int write_sockfd;
 
         if(client_pipe_mode)
         {
@@ -198,10 +197,10 @@ int handle_server_tcp_frame(protocol_frame *rcvd_frame)
 
         if(sent_bytes < 0)
         {
-            char data[PROTOCOL_BUFFER_OFFSET];
+            uint8_t data[PROTOCOL_BUFFER_OFFSET];
             protocol_frame frame_st, *frame;
 
-            log_printf(L_INFO, "Could not write to socket %d: %s\n", write_sockfd, strerror(errno));
+            log_printf(L_INFO, "Could not write to socket: %s\n", strerror(errno));
 
             frame = &frame_st;
             memset(frame, 0, sizeof(protocol_frame));
@@ -227,7 +226,6 @@ int handle_server_tcp_frame(protocol_frame *rcvd_frame)
 int handle_server_tcp_fin_frame(protocol_frame *rcvd_frame)
 {
     tunnel *tun=NULL;
-    int offset = 0;
     int connid = rcvd_frame->connid;
 
     HASH_FIND_INT(by_id, &connid, tun);
@@ -250,7 +248,7 @@ int handle_server_tcp_fin_frame(protocol_frame *rcvd_frame)
 }
 
 /* Main loop for the client */
-int do_client_loop(char *tox_id_str)
+int do_client_loop(uint8_t *tox_id_str)
 {
     unsigned char tox_packet_buf[PROTOCOL_MAX_PACKET_SIZE];
     unsigned char tox_id[TOX_ADDRESS_SIZE];
@@ -298,15 +296,15 @@ int do_client_loop(char *tox_id_str)
                 break;
             case CLIENT_STATE_CONNECTED:
                 {
-                    uint8_t* data = "Hi, fellow tuntox instance!";
+                    uint8_t* data = (uint8_t *)"Hi, fellow tuntox instance!";
                     uint16_t length = sizeof(data);
                     TOX_ERR_FRIEND_ADD add_error;
 
                     if(use_shared_secret)
                     {
-                        data = shared_secret;
+                        data = (uint8_t *)shared_secret;
                         data[TOX_MAX_FRIEND_REQUEST_LENGTH-1] = '\0';
-                        length = strlen(data)+1;
+                        length = strlen((char *)data)+1;
                         log_printf(L_DEBUG, "Sent shared secret of length %u\n", length);
                     }
 
@@ -492,7 +490,7 @@ int do_client_loop(char *tox_id_str)
                             /* Check if connection closed */
                             if(nbytes == 0)
                             {
-                                char data[PROTOCOL_BUFFER_OFFSET];
+                                uint8_t data[PROTOCOL_BUFFER_OFFSET];
                                 protocol_frame frame_st, *frame;
 
                                 log_printf(L_INFO, "Connection closed\n");