From 68aa2354b558665b2f2b816b8ff0e863a6a41db5 Mon Sep 17 00:00:00 2001 From: z3bra Date: Tue, 1 Nov 2016 22:11:37 +0100 Subject: Ditch TOX_FRIEND_ADDRESS_SIZE --- ratox.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ratox.c') diff --git a/ratox.c b/ratox.c index a35971e..2fd3b57 100644 --- a/ratox.c +++ b/ratox.c @@ -1095,7 +1095,7 @@ localinit(void) size_t i, m; int r; uint8_t name[TOX_MAX_NAME_LENGTH + 1]; - uint8_t address[TOX_FRIEND_ADDRESS_SIZE]; + uint8_t address[TOX_ADDRESS_SIZE]; uint8_t status[TOX_MAX_STATUS_MESSAGE_LENGTH + 1]; for (i = 0; i < LEN(gslots); i++) { @@ -1167,7 +1167,7 @@ localinit(void) if (idfd < 0) eprintf("open %s:", "id"); tox_get_address(tox, address); - for (i = 0; i < TOX_FRIEND_ADDRESS_SIZE; i++) + for (i = 0; i < TOX_ADDRESS_SIZE; i++) dprintf(idfd, "%02X", address[i]); dprintf(idfd, "\n"); @@ -1520,7 +1520,7 @@ sendfriendreq(void *data) int r; char buf[PIPE_BUF], *p; char *msg = "ratox is awesome!"; - uint8_t id[TOX_FRIEND_ADDRESS_SIZE]; + uint8_t id[TOX_ADDRESS_SIZE]; n = fiforead(gslots[REQUEST].dirfd, &gslots[REQUEST].fd[IN], gfiles[IN], buf, sizeof(buf) - 1); @@ -1569,7 +1569,7 @@ setnospam(void *data) ssize_t n, i; uint32_t nsval; uint8_t nospam[2 * sizeof(uint32_t) + 1]; - uint8_t address[TOX_FRIEND_ADDRESS_SIZE]; + uint8_t address[TOX_ADDRESS_SIZE]; n = fiforead(gslots[NOSPAM].dirfd, &gslots[NOSPAM].fd[IN], gfiles[IN], nospam, sizeof(nospam) - 1); @@ -1597,7 +1597,7 @@ setnospam(void *data) tox_get_address(tox, address); ftruncate(idfd, 0); lseek(idfd, 0, SEEK_SET); - for (i = 0; i < TOX_FRIEND_ADDRESS_SIZE; i++) + for (i = 0; i < TOX_ADDRESS_SIZE; i++) dprintf(idfd, "%02X", address[i]); dprintf(idfd, "\n"); end: -- cgit v1.2.3