diff options
| author | 2013-09-30 15:58:24 +0200 | |
|---|---|---|
| committer | 2013-09-30 15:58:24 +0200 | |
| commit | b483eda23f1fb71935da4fa1bd91ad422c4e5e80 (patch) | |
| tree | 616696af6b5d3fe34a60f3ed1b9367ea33cd3a45 /src/device.c | |
| parent | 4847a1161c712e6e56287b367296cc837bcd6b0a (diff) | |
| download | usbmuxd-b483eda23f1fb71935da4fa1bd91ad422c4e5e80.tar.gz usbmuxd-b483eda23f1fb71935da4fa1bd91ad422c4e5e80.tar.bz2 | |
device: suppress two compiler warnings with appropriate casts
Diffstat (limited to 'src/device.c')
| -rw-r--r-- | src/device.c | 6 |
1 files 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 | |||
| 386 | return; | 386 | return; |
| 387 | } | 387 | } |
| 388 | conn->tx_ack += size; | 388 | conn->tx_ack += size; |
| 389 | if(size == conn->ib_size) { | 389 | if(size == (int)conn->ib_size) { |
| 390 | conn->ib_size = 0; | 390 | conn->ib_size = 0; |
| 391 | } else { | 391 | } else { |
| 392 | conn->ib_size -= size; | 392 | conn->ib_size -= size; |
| @@ -721,7 +721,7 @@ int device_get_list(int include_hidden, struct device_info *p) | |||
| 721 | 721 | ||
| 722 | int device_get_timeout(void) | 722 | int device_get_timeout(void) |
| 723 | { | 723 | { |
| 724 | uint64_t oldest = (uint64_t)-1; | 724 | uint64_t oldest = (uint64_t)-1LL; |
| 725 | FOREACH(struct mux_device *dev, &device_list) { | 725 | FOREACH(struct mux_device *dev, &device_list) { |
| 726 | if(dev->state == MUXDEV_ACTIVE) { | 726 | if(dev->state == MUXDEV_ACTIVE) { |
| 727 | FOREACH(struct mux_connection *conn, &dev->connections) { | 727 | FOREACH(struct mux_connection *conn, &dev->connections) { |
| @@ -731,7 +731,7 @@ int device_get_timeout(void) | |||
| 731 | } | 731 | } |
| 732 | } ENDFOREACH | 732 | } ENDFOREACH |
| 733 | uint64_t ct = mstime64(); | 733 | uint64_t ct = mstime64(); |
| 734 | if(oldest == -1) | 734 | if((int64_t)oldest == -1LL) |
| 735 | return 100000; //meh | 735 | return 100000; //meh |
| 736 | if((ct - oldest) > ACK_TIMEOUT) | 736 | if((ct - oldest) > ACK_TIMEOUT) |
| 737 | return 0; | 737 | return 0; |
