From ab2805a23baad56d9efddada992d60fab3ed22af Mon Sep 17 00:00:00 2001 From: "Coren[m]" Date: Mon, 16 Sep 2013 10:37:22 +0200 Subject: Fix warnings of -Wall -Wextra --- toxcore/DHT.c | 12 ++++++------ toxcore/Messenger.c | 2 +- toxcore/network.c | 17 ++++++++++------- toxcore/util.c | 4 ++-- 4 files changed, 19 insertions(+), 16 deletions(-) (limited to 'toxcore') diff --git a/toxcore/DHT.c b/toxcore/DHT.c index 2f7b2263..db9bfe3c 100644 --- a/toxcore/DHT.c +++ b/toxcore/DHT.c @@ -200,8 +200,8 @@ static void get_close_nodes_inner(DHT *dht, uint8_t *client_id, Node_format *nod time_t timestamp, int *num_nodes_ptr) { int num_nodes = *num_nodes_ptr; - int i, tout, inlist, ipv46x, j, closest; - + int tout, inlist, ipv46x, j, closest; + uint32_t i; for (i = 0; i < client_list_length; i++) { Client_data *client = &client_list[i]; tout = is_timeout(timestamp, client->timestamp, BAD_NODE_TIMEOUT); @@ -726,10 +726,10 @@ static int handle_sendnodes(void *object, IP_Port source, uint8_t *packet, uint3 #ifdef TOX_ENABLE_IPV6 Node4_format *nodes4_list = (Node4_format *)(plain + sizeof(ping_id)); - int num_nodes_ok = 0; + uint32_t num_nodes_ok = 0; for (i = 0; i < num_nodes; i++) - if ((nodes4_list[i].ip_port.ip.uint32 != 0) && (nodes4_list[i].ip_port.ip.uint32 != ~0)) { + if ((nodes4_list[i].ip_port.ip.uint32 != 0) && (nodes4_list[i].ip_port.ip.uint32 != (uint32_t)~0)) { memcpy(nodes_list[num_nodes_ok].client_id, nodes4_list[i].client_id, CLIENT_ID_SIZE); nodes_list[num_nodes_ok].ip_port.ip.family = AF_INET; nodes_list[num_nodes_ok].ip_port.ip.ip4.uint32 = nodes4_list[i].ip_port.ip.uint32; @@ -1477,14 +1477,14 @@ void DHT_save(DHT *dht, uint8_t *data) int DHT_load(DHT *dht, uint8_t *data, uint32_t size) { if (size < sizeof(dht->close_clientlist)) { - fprintf(stderr, "DHT_load: Expected at least %lu bytes, got %u.\n", sizeof(dht->close_clientlist), size); + fprintf(stderr, "DHT_load: Expected at least %u bytes, got %u.\n", sizeof(dht->close_clientlist), size); return -1; } uint32_t friendlistsize = size - sizeof(dht->close_clientlist); if (friendlistsize % sizeof(DHT_Friend) != 0) { - fprintf(stderr, "DHT_load: Expected a multiple of %lu, got %u.\n", sizeof(DHT_Friend), friendlistsize); + fprintf(stderr, "DHT_load: Expected a multiple of %u, got %u.\n", sizeof(DHT_Friend), friendlistsize); return -1; } diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index eb18e3a3..c46e3938 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c @@ -1220,7 +1220,7 @@ void doInbound(Messenger *m) } #ifdef LOGGING -#define DUMPING_CLIENTS_FRIENDS_EVERY_N_SECONDS 60 +#define DUMPING_CLIENTS_FRIENDS_EVERY_N_SECONDS 60UL static time_t lastdump = 0; static char IDString[CLIENT_ID_SIZE * 2 + 1]; static char *ID2String(uint8_t *client_id) diff --git a/toxcore/network.c b/toxcore/network.c index 4b6dc3be..4f6b0aae 100644 --- a/toxcore/network.c +++ b/toxcore/network.c @@ -154,14 +154,15 @@ static int receivepacket(sock_t sock, IP_Port *ip_port, uint8_t *data, uint32_t #ifdef WIN32 int addrlen = sizeof(addr); #else - uint32_t addrlen = sizeof(addr); + socklen_t addrlen = sizeof(addr); #endif - (*(int32_t *)length) = recvfrom(sock, (char *) data, MAX_UDP_PACKET_SIZE, 0, (struct sockaddr *)&addr, &addrlen); + *length = 0; + int fail_or_len = recvfrom(sock, (char *) data, MAX_UDP_PACKET_SIZE, 0, (struct sockaddr *)&addr, &addrlen); - if (*(int32_t *)length <= 0) { + if (fail_or_len <= 0) { #ifdef LOGGING - if ((length < 0) && (errno != EWOULDBLOCK)) { + if ((fail_or_len < 0) && (errno != EWOULDBLOCK)) { sprintf(logbuffer, "Unexpected error reading from socket: %u, %s\n", errno, strerror(errno)); loglog(logbuffer); } @@ -170,6 +171,8 @@ static int receivepacket(sock_t sock, IP_Port *ip_port, uint8_t *data, uint32_t return -1; /* Nothing received or empty packet. */ } + *length = (uint32_t)fail_or_len; + #ifdef TOX_ENABLE_IPV6 if (addr.ss_family == AF_INET) { @@ -863,15 +866,15 @@ static void loglogdata(char *message, uint8_t *buffer, size_t buflen, IP_Port *i ip_ntoa(&ip_port->ip), ntohs(ip_port->port), errno, strerror(errno), buflen > 4 ? ntohl(*(uint32_t *)&buffer[1]) : 0, buflen > 7 ? ntohl(*(uint32_t *)(&buffer[5])) : 0); - else if ((res > 0) && (res <= buflen)) + else if ((res > 0) && ((size_t)res <= buflen)) snprintf(logbuffer, sizeof(logbuffer), "[%2u] %s %3u%c %s:%u (%u: %s) | %04x%04x\n", - buffer[0], message, res < 999 ? res : 999, res < buflen ? '<' : '=', + buffer[0], message, res < 999 ? res : 999, (size_t)res < buflen ? '<' : '=', ip_ntoa(&ip_port->ip), ntohs(ip_port->port), 0, "OK", buflen > 4 ? ntohl(*(uint32_t *)&buffer[1]) : 0, buflen > 7 ? ntohl(*(uint32_t *)(&buffer[5])) : 0); else /* empty or overwrite */ snprintf(logbuffer, sizeof(logbuffer), "[%2u] %s %u%c%u %s:%u (%u: %s) | %04x%04x\n", - buffer[0], message, res, !res ? '0' : '>', buflen, + buffer[0], message, res, !res ? '!' : '>', buflen, ip_ntoa(&ip_port->ip), ntohs(ip_port->port), 0, "OK", buflen > 4 ? ntohl(*(uint32_t *)&buffer[1]) : 0, buflen > 7 ? ntohl(*(uint32_t *)(&buffer[5])) : 0); diff --git a/toxcore/util.c b/toxcore/util.c index 8960fe36..e1c46ee5 100644 --- a/toxcore/util.c +++ b/toxcore/util.c @@ -52,14 +52,14 @@ void loginit(uint16_t port) if (logfile) fclose(logfile); - sprintf(logbuffer, "%u-%u.log", ntohs(port), now()); + sprintf(logbuffer, "%u-%u.log", ntohs(port), (uint32_t)now()); logfile = fopen(logbuffer, "w"); starttime = now(); }; void loglog(char *text) { if (logfile) { - fprintf(logfile, "%4u ", now() - starttime); + fprintf(logfile, "%4u ", (uint32_t)(now() - starttime)); fprintf(logfile, text); fflush(logfile); } -- cgit v1.2.3