cosmetic changes

ncd/modules/net_backend_wpa_supplicant.c

@@ -162,7 +162,7 @@ void process_pipe_handler_send (struct instance *o, uint8_t *data, int data_len)
         return;
     }
     
-    if (data_begins_with(data, data_len, EVENT_STRING_CONNECTED)) {
+    if (data_begins_with((char *)data, data_len, EVENT_STRING_CONNECTED)) {
         ModuleLog(o->i, BLOG_INFO, "connected event");
         
         if (!o->up) {
@@ -170,7 +170,7 @@ void process_pipe_handler_send (struct instance *o, uint8_t *data, int data_len)
             NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
         }
     }
-    else if (data_begins_with(data, data_len, EVENT_STRING_DISCONNECTED)) {
+    else if (data_begins_with((char *)data, data_len, EVENT_STRING_DISCONNECTED)) {
         ModuleLog(o->i, BLOG_INFO, "disconnected event");
         
         if (o->up) {

threadwork/BThreadWork.c

@@ -21,6 +21,7 @@
  */
 
 #include <stdint.h>
+#include <stddef.h>
 
 #ifdef BADVPN_THREADWORK_USE_PTHREAD
     #include <unistd.h>
@@ -83,6 +84,8 @@ static void * dispatcher_thread (struct BThreadWorkDispatcher_thread *t)
     }
     
     ASSERT_FORCE(pthread_mutex_unlock(&o->mutex) == 0)
+    
+    return NULL;
 }
 
 static void dispatch_job (BThreadWorkDispatcher *o)

tun2socks/SocksUdpGwClient.c

@@ -32,7 +32,7 @@ static void try_connect (SocksUdpGwClient *o);
 static void reconnect_timer_handler (SocksUdpGwClient *o);
 static void socks_client_handler (SocksUdpGwClient *o, int event);
 static void udpgw_handler_servererror (SocksUdpGwClient *o);
-static void udpgw_handler_received (SocksUdpGwClient *o, BAddr local_addr, BAddr remote_addr, const char *data, int data_len);
+static void udpgw_handler_received (SocksUdpGwClient *o, BAddr local_addr, BAddr remote_addr, const uint8_t *data, int data_len);
 
 static void free_socks (SocksUdpGwClient *o)
 {
@@ -143,7 +143,7 @@ static void udpgw_handler_servererror (SocksUdpGwClient *o)
     BReactor_SetTimer(o->reactor, &o->reconnect_timer);
 }
 
-static void udpgw_handler_received (SocksUdpGwClient *o, BAddr local_addr, BAddr remote_addr, const char *data, int data_len)
+static void udpgw_handler_received (SocksUdpGwClient *o, BAddr local_addr, BAddr remote_addr, const uint8_t *data, int data_len)
 {
     DebugObject_Access(&o->d_obj);
     

tun2socks/SocksUdpGwClient.h

@@ -28,7 +28,7 @@
 #include <udpgw_client/UdpGwClient.h>
 #include <socksclient/BSocksClient.h>
 
-typedef void (*SocksUdpGwClient_handler_received) (void *user, BAddr local_addr, BAddr remote_addr, const char *data, int data_len);
+typedef void (*SocksUdpGwClient_handler_received) (void *user, BAddr local_addr, BAddr remote_addr, const uint8_t *data, int data_len);
 
 typedef struct {
     int udp_mtu;

tun2socks/tun2socks.c

@@ -199,7 +199,7 @@ static void client_socks_recv_initiate (struct tcp_client *client);
 static void client_socks_recv_handler_done (struct tcp_client *client, int data_len);
 static int client_socks_recv_send_out (struct tcp_client *client);
 static err_t client_sent_func (void *arg, struct tcp_pcb *tpcb, u16_t len);
-static void udpgw_client_handler_received (void *unused, BAddr local_addr, BAddr remote_addr, const char *data, int data_len);
+static void udpgw_client_handler_received (void *unused, BAddr local_addr, BAddr remote_addr, const uint8_t *data, int data_len);
 
 int main (int argc, char **argv)
 {
@@ -1473,7 +1473,7 @@ err_t client_sent_func (void *arg, struct tcp_pcb *tpcb, u16_t len)
     return ERR_OK;
 }
 
-void udpgw_client_handler_received (void *unused, BAddr local_addr, BAddr remote_addr, const char *data, int data_len)
+void udpgw_client_handler_received (void *unused, BAddr local_addr, BAddr remote_addr, const uint8_t *data, int data_len)
 {
     ASSERT(options.udpgw_remote_server_addr)
     ASSERT(data_len >= 0)

udevmonitor/NCDUdevMonitorParser.c

@@ -87,7 +87,7 @@ static int parse_message (NCDUdevMonitorParser *o)
     o->buf[o->ready_len - 1] = '\0';
     
     // start parsing
-    char *line = o->buf;
+    char *line = (char *)o->buf;
     int first_line = 1;
     
     // set is not ready event

udpgw_client/UdpGwClient.h

@@ -40,7 +40,7 @@
 #include <flowextra/PacketPassInactivityMonitor.h>
 
 typedef void (*UdpGwClient_handler_servererror) (void *user);
-typedef void (*UdpGwClient_handler_received) (void *user, BAddr local_addr, BAddr remote_addr, const char *data, int data_len);
+typedef void (*UdpGwClient_handler_received) (void *user, BAddr local_addr, BAddr remote_addr, const uint8_t *data, int data_len);
 
 typedef struct {
     int udp_mtu;