diff options
author | irungentoo <irungentoo@gmail.com> | 2013-09-27 09:02:19 -0700 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2013-09-27 09:02:19 -0700 |
commit | c7c72b0756e3bf4fcc3e346c34849d801be5c5fd (patch) | |
tree | 07fcf0108fe1813db5d386974eedb9fac5c67d62 /toxcore/Messenger.c | |
parent | beff2b6de659a708ed366a9ae925eab8c4ca0ddd (diff) | |
parent | 6fe25e4f6f49d1f19bdcc5ce89a587c29757b266 (diff) |
Merge pull request #606 from FullName/Permit.Wshadow
Permit -Wshadow as useful warning.
Diffstat (limited to 'toxcore/Messenger.c')
-rw-r--r-- | toxcore/Messenger.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index f22a8d57..07c8096f 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c | |||
@@ -613,11 +613,11 @@ static void check_friend_connectionstatus(Messenger *m, int friendnumber, uint8_ | |||
613 | if (status == NOFRIEND) | 613 | if (status == NOFRIEND) |
614 | return; | 614 | return; |
615 | 615 | ||
616 | const uint8_t was_connected = m->friendlist[friendnumber].status == FRIEND_ONLINE; | 616 | const uint8_t was_online = m->friendlist[friendnumber].status == FRIEND_ONLINE; |
617 | const uint8_t is_connected = status == FRIEND_ONLINE; | 617 | const uint8_t is_online = status == FRIEND_ONLINE; |
618 | 618 | ||
619 | if (is_connected != was_connected) | 619 | if (is_online != was_online) |
620 | m->friend_connectionstatuschange(m, friendnumber, is_connected, m->friend_connectionstatuschange_userdata); | 620 | m->friend_connectionstatuschange(m, friendnumber, is_online, m->friend_connectionstatuschange_userdata); |
621 | } | 621 | } |
622 | 622 | ||
623 | void set_friend_status(Messenger *m, int friendnumber, uint8_t status) | 623 | void set_friend_status(Messenger *m, int friendnumber, uint8_t status) |