From b483eda23f1fb71935da4fa1bd91ad422c4e5e80 Mon Sep 17 00:00:00 2001 From: Nikias Bassen Date: Mon, 30 Sep 2013 15:58:24 +0200 Subject: device: suppress two compiler warnings with appropriate casts --- src/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/device.c b/src/device.c index 99e0153..b6cc32a 100644 --- a/src/device.c +++ b/src/device.c @@ -386,7 +386,7 @@ void device_client_process(int device_id, struct mux_client *client, short event return; } conn->tx_ack += size; - if(size == conn->ib_size) { + if(size == (int)conn->ib_size) { conn->ib_size = 0; } else { conn->ib_size -= size; @@ -721,7 +721,7 @@ int device_get_list(int include_hidden, struct device_info *p) int device_get_timeout(void) { - uint64_t oldest = (uint64_t)-1; + uint64_t oldest = (uint64_t)-1LL; FOREACH(struct mux_device *dev, &device_list) { if(dev->state == MUXDEV_ACTIVE) { FOREACH(struct mux_connection *conn, &dev->connections) { @@ -731,7 +731,7 @@ int device_get_timeout(void) } } ENDFOREACH uint64_t ct = mstime64(); - if(oldest == -1) + if((int64_t)oldest == -1LL) return 100000; //meh if((ct - oldest) > ACK_TIMEOUT) return 0; -- cgit v1.1-32-gdbae