From d56cb132797b3843210565b8bcf7e8cf84fe36f0 Mon Sep 17 00:00:00 2001 From: iphydf Date: Mon, 28 Mar 2022 21:12:08 +0000 Subject: [PATCH] cleanup: Avoid name clash between struct field and function. `connection_status_callback` is also used as struct field in net_crypto. --- toxcore/Messenger.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index a5eccc2e4c..6d37d3b41b 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c @@ -2324,7 +2324,7 @@ static void do_friends(Messenger *m, void *userdata) } non_null(1) nullable(2) -static void connection_status_callback(Messenger *m, void *userdata) +static void m_connection_status_callback(Messenger *m, void *userdata) { const Onion_Connection_Status conn_status = onion_connection_status(m->onion_c); @@ -2416,7 +2416,7 @@ void do_messenger(Messenger *m, void *userdata) do_onion_client(m->onion_c); do_friend_connections(m->fr_c, userdata); do_friends(m, userdata); - connection_status_callback(m, userdata); + m_connection_status_callback(m, userdata); if (mono_time_get(m->mono_time) > m->lastdump + DUMPING_CLIENTS_FRIENDS_EVERY_N_SECONDS) { m->lastdump = mono_time_get(m->mono_time);