StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Avoid multiple for-next expressions.

Browse Source 
All for-loops in toxcore are of the form

    for (<for-init>; <for-cond>; <for-next>) { <body> }

`for-init` can be a variable declaration (like `int i = 0`), an
assignment (like `i = 0`), or empty.

`for-cond` can be any expression.

`for-next` can be an assignment or a single increment/decrement
expression (like `++i` or `--i`).

No other forms are allowed, so e.g. comma expressions in any of these are
not allowed (so no `for (i = 0, j = n; ...; ++i, --j)`).
This commit is contained in:
iphydf 2018-08-02 00:25:20 +00:00
parent aa63c1330c
commit 7f8b29c346
No known key found for this signature in database
GPG Key ID: 3855DBA2D74403C9
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
toxcore/DHT.c
View File

@ -1704,12 +1704,10 @@ static uint8_t do_ping_and_sendnode_requests(DHT *dht, uint64_t *lastgetnode, co
/* If node is not dead. */
Client_data *client = &list[i];
IPPTsPng *const assocs[] = { &client->assoc6, &client->assoc4, nullptr };
IPPTsPng *const assocs[] = { &client->assoc6, &client->assoc4 };
uint32_t j = 0;
for (IPPTsPng * const *it = assocs; *it; ++it, ++j) {
IPPTsPng *const assoc = *it;
for (uint32_t j = 0; j < sizeof(assocs) / sizeof(assocs[0]); ++j) {
IPPTsPng *const assoc = assocs[j];
if (!is_timeout(assoc->timestamp, KILL_NODE_TIMEOUT)) {
sort = 0;

7
toxcore/Messenger.c
View File

@ -2631,10 +2631,11 @@ void do_messenger(Messenger *m, void *userdata)
for (client = 0; client < LCLIENT_LIST; ++client) {
const Client_data *cptr = dht_get_close_client(m->dht, client);
const IPPTsPng *assoc = nullptr;
uint32_t a;
const IPPTsPng *const assocs[] = { &cptr->assoc4, &cptr->assoc4, nullptr };
for (const IPPTsPng * const *it = assocs; *it; ++it) {
const IPPTsPng *const assoc = *it;
for (a = 0, assoc = &cptr->assoc4; a < 2; ++a, assoc = &cptr->assoc6) {
if (ip_isset(&assoc->ip_port.ip)) {
last_pinged = m->lastdump - assoc->last_pinged;