From 69b6fbcd0eecb1253a0e685c2ac4b1555d7bd1c2 Mon Sep 17 00:00:00 2001 From: pranomostro Date: Wed, 23 Nov 2016 10:52:44 +0100 Subject: Adjust the types of a few variables where it makes sense, mostly in regard to comparisons between signed and unsigned integers. --- ratox.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'ratox.c') diff --git a/ratox.c b/ratox.c index daf40ef..4c05822 100644 --- a/ratox.c +++ b/ratox.c @@ -152,7 +152,7 @@ struct call { struct friend { char name[TOX_MAX_NAME_LENGTH + 1]; - int32_t num; + uint32_t num; uint8_t id[TOX_PUBLIC_KEY_SIZE]; char idstr[2 * TOX_PUBLIC_KEY_SIZE + 1]; int dirfd; @@ -768,7 +768,7 @@ cbfiledatareq(Tox *m, uint32_t frnum, uint32_t fnum, uint64_t pos, size_t flen, * if a chunk with length less than the length requested in the * callback is sent. */ - if (!f->tx.pendingbuf && f->tx.n < flen) { + if (!f->tx.pendingbuf && (size_t)f->tx.n < flen) { logmsg(": %s : Tx > Complete\n", f->name); f->tx.state = TRANSFER_NONE; f->tx.fnum = -1; @@ -1333,7 +1333,7 @@ friendcreate(uint32_t frnum) static void frienddestroy(struct friend *f) { - int i; + size_t i; canceltxtransfer(f); cancelrxtransfer(f); @@ -1557,7 +1557,8 @@ loop(void) struct timeval tv; fd_set rfds; time_t t0, t1; - int connected = 0, i, n, r, fd, fdmax; + size_t i; + int connected = 0, n, r, fd, fdmax; char tstamp[64], c; uint32_t e; @@ -1788,7 +1789,7 @@ toxshutdown(void) { struct friend *f, *ftmp; struct request *r, *rtmp; - int i, m; + size_t i, m; logmsg("Shutdown\n"); -- cgit v1.2.3