Match parameter names in declarations with their definitions.

The parameter names were taken from function definitions to update the names in
function declarations (prototypes).

6 files changed, 105 insertions, 106 deletions

diff --git a/toxav/rtp.h b/toxav/rtp.h
index 4d62a466..9a5db78a 100644
--- a/toxav/rtp.h
+++ b/toxav/rtp.h
@@ -98,7 +98,7 @@ typedef struct {
 } RTPSession;
 
 
-RTPSession *rtp_new (int payload_type, Messenger *m, uint32_t friend_num,
+RTPSession *rtp_new (int payload_type, Messenger *m, uint32_t friendnumber,
                      BWController *bwc, void *cs,
                      int (*mcb) (void *, struct RTPMessage *));
 void rtp_kill (RTPSession *session);
diff --git a/toxav/toxav.c b/toxav/toxav.c
index d7b367f7..126e29a7 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -327,10 +327,10 @@ END:
 
     return rc == TOXAV_ERR_CALL_OK;
 }
-void toxav_callback_call(ToxAV *av, toxav_call_cb *function, void *user_data)
+void toxav_callback_call(ToxAV *av, toxav_call_cb *callback, void *user_data)
 {
     pthread_mutex_lock(av->mutex);
-    av->ccb.first = function;
+    av->ccb.first = callback;
     av->ccb.second = user_data;
     pthread_mutex_unlock(av->mutex);
 }
@@ -386,10 +386,10 @@ END:
 
     return rc == TOXAV_ERR_ANSWER_OK;
 }
-void toxav_callback_call_state(ToxAV *av, toxav_call_state_cb *function, void *user_data)
+void toxav_callback_call_state(ToxAV *av, toxav_call_state_cb *callback, void *user_data)
 {
     pthread_mutex_lock(av->mutex);
-    av->scb.first = function;
+    av->scb.first = callback;
     av->scb.second = user_data;
     pthread_mutex_unlock(av->mutex);
 }
@@ -662,10 +662,10 @@ END:
 
     return rc == TOXAV_ERR_BIT_RATE_SET_OK;
 }
-void toxav_callback_bit_rate_status(ToxAV *av, toxav_bit_rate_status_cb *function, void *user_data)
+void toxav_callback_bit_rate_status(ToxAV *av, toxav_bit_rate_status_cb *callback, void *user_data)
 {
     pthread_mutex_lock(av->mutex);
-    av->bcb.first = function;
+    av->bcb.first = callback;
     av->bcb.second = user_data;
     pthread_mutex_unlock(av->mutex);
 }
@@ -854,17 +854,17 @@ END:
 
     return rc == TOXAV_ERR_SEND_FRAME_OK;
 }
-void toxav_callback_audio_receive_frame(ToxAV *av, toxav_audio_receive_frame_cb *function, void *user_data)
+void toxav_callback_audio_receive_frame(ToxAV *av, toxav_audio_receive_frame_cb *callback, void *user_data)
 {
     pthread_mutex_lock(av->mutex);
-    av->acb.first = function;
+    av->acb.first = callback;
     av->acb.second = user_data;
     pthread_mutex_unlock(av->mutex);
 }
-void toxav_callback_video_receive_frame(ToxAV *av, toxav_video_receive_frame_cb *function, void *user_data)
+void toxav_callback_video_receive_frame(ToxAV *av, toxav_video_receive_frame_cb *callback, void *user_data)
 {
     pthread_mutex_lock(av->mutex);
-    av->vcb.first = function;
+    av->vcb.first = callback;
     av->vcb.second = user_data;
     pthread_mutex_unlock(av->mutex);
 }
diff --git a/toxav/toxav.h b/toxav/toxav.h
index 947d3c2c..58619c6c 100644
--- a/toxav/toxav.h
+++ b/toxav/toxav.h
@@ -212,12 +212,12 @@ ToxAV *toxav_new(Tox *tox, TOXAV_ERR_NEW *error);
  * notifying peers. After calling this function, no other functions may be
  * called and the av pointer becomes invalid.
  */
-void toxav_kill(ToxAV *toxAV);
+void toxav_kill(ToxAV *av);
 
 /**
  * Returns the Tox instance the A/V object was created for.
  */
-Tox *toxav_get_tox(const ToxAV *toxAV);
+Tox *toxav_get_tox(const ToxAV *av);
 
 
 /*******************************************************************************
@@ -232,14 +232,14 @@ Tox *toxav_get_tox(const ToxAV *toxAV);
  * Returns the interval in milliseconds when the next toxav_iterate call should
  * be. If no call is active at the moment, this function returns 200.
  */
-uint32_t toxav_iteration_interval(const ToxAV *toxAV);
+uint32_t toxav_iteration_interval(const ToxAV *av);
 
 /**
  * Main loop for the session. This function needs to be called in intervals of
  * toxav_iteration_interval() milliseconds. It is best called in the separate
  * thread from tox_iterate.
  */
-void toxav_iterate(ToxAV *toxAV);
+void toxav_iterate(ToxAV *av);
 
 
 /*******************************************************************************
@@ -306,7 +306,7 @@ typedef enum TOXAV_ERR_CALL {
  * @param video_bit_rate Video bit rate in Kb/sec. Set this to 0 to disable
  * video sending.
  */
-bool toxav_call(ToxAV *toxAV, uint32_t friend_number, uint32_t audio_bit_rate, uint32_t video_bit_rate,
+bool toxav_call(ToxAV *av, uint32_t friend_number, uint32_t audio_bit_rate, uint32_t video_bit_rate,
                 TOXAV_ERR_CALL *error);
 
 /**
@@ -316,15 +316,14 @@ bool toxav_call(ToxAV *toxAV, uint32_t friend_number, uint32_t audio_bit_rate, u
  * @param audio_enabled True if friend is sending audio.
  * @param video_enabled True if friend is sending video.
  */
-typedef void toxav_call_cb(ToxAV *toxAV, uint32_t friend_number, bool audio_enabled, bool video_enabled,
-                           void *user_data);
+typedef void toxav_call_cb(ToxAV *av, uint32_t friend_number, bool audio_enabled, bool video_enabled, void *user_data);
 
 
 /**
  * Set the callback for the `call` event. Pass NULL to unset.
  *
  */
-void toxav_callback_call(ToxAV *toxAV, toxav_call_cb *callback, void *user_data);
+void toxav_callback_call(ToxAV *av, toxav_call_cb *callback, void *user_data);
 
 typedef enum TOXAV_ERR_ANSWER {
 
@@ -377,7 +376,7 @@ typedef enum TOXAV_ERR_ANSWER {
  * @param video_bit_rate Video bit rate in Kb/sec. Set this to 0 to disable
  * video sending.
  */
-bool toxav_answer(ToxAV *toxAV, uint32_t friend_number, uint32_t audio_bit_rate, uint32_t video_bit_rate,
+bool toxav_answer(ToxAV *av, uint32_t friend_number, uint32_t audio_bit_rate, uint32_t video_bit_rate,
                   TOXAV_ERR_ANSWER *error);
 
 
@@ -438,14 +437,14 @@ enum TOXAV_FRIEND_CALL_STATE {
  * paused. The bitmask represents all the activities currently performed by the
  * friend.
  */
-typedef void toxav_call_state_cb(ToxAV *toxAV, uint32_t friend_number, uint32_t state, void *user_data);
+typedef void toxav_call_state_cb(ToxAV *av, uint32_t friend_number, uint32_t state, void *user_data);
 
 
 /**
  * Set the callback for the `call_state` event. Pass NULL to unset.
  *
  */
-void toxav_callback_call_state(ToxAV *toxAV, toxav_call_state_cb *callback, void *user_data);
+void toxav_callback_call_state(ToxAV *av, toxav_call_state_cb *callback, void *user_data);
 
 
 /*******************************************************************************
@@ -543,8 +542,7 @@ typedef enum TOXAV_ERR_CALL_CONTROL {
  *
  * @return true on success.
  */
-bool toxav_call_control(ToxAV *toxAV, uint32_t friend_number, TOXAV_CALL_CONTROL control,
-                        TOXAV_ERR_CALL_CONTROL *error);
+bool toxav_call_control(ToxAV *av, uint32_t friend_number, TOXAV_CALL_CONTROL control, TOXAV_ERR_CALL_CONTROL *error);
 
 
 /*******************************************************************************
@@ -601,7 +599,7 @@ typedef enum TOXAV_ERR_BIT_RATE_SET {
  * video sending. Set to -1 to leave unchanged.
  *
  */
-bool toxav_bit_rate_set(ToxAV *toxAV, uint32_t friend_number, int32_t audio_bit_rate, int32_t video_bit_rate,
+bool toxav_bit_rate_set(ToxAV *av, uint32_t friend_number, int32_t audio_bit_rate, int32_t video_bit_rate,
                         TOXAV_ERR_BIT_RATE_SET *error);
 
 /**
@@ -614,7 +612,7 @@ bool toxav_bit_rate_set(ToxAV *toxAV, uint32_t friend_number, int32_t audio_bit_
  * @param audio_bit_rate Suggested maximum audio bit rate in Kb/sec.
  * @param video_bit_rate Suggested maximum video bit rate in Kb/sec.
  */
-typedef void toxav_bit_rate_status_cb(ToxAV *toxAV, uint32_t friend_number, uint32_t audio_bit_rate,
+typedef void toxav_bit_rate_status_cb(ToxAV *av, uint32_t friend_number, uint32_t audio_bit_rate,
                                       uint32_t video_bit_rate, void *user_data);
 
 
@@ -622,7 +620,7 @@ typedef void toxav_bit_rate_status_cb(ToxAV *toxAV, uint32_t friend_number, uint
  * Set the callback for the `bit_rate_status` event. Pass NULL to unset.
  *
  */
-void toxav_callback_bit_rate_status(ToxAV *toxAV, toxav_bit_rate_status_cb *callback, void *user_data);
+void toxav_callback_bit_rate_status(ToxAV *av, toxav_bit_rate_status_cb *callback, void *user_data);
 
 
 /*******************************************************************************
@@ -701,7 +699,7 @@ typedef enum TOXAV_ERR_SEND_FRAME {
  * @param sampling_rate Audio sampling rate used in this frame. Valid sampling
  * rates are 8000, 12000, 16000, 24000, or 48000.
  */
-bool toxav_audio_send_frame(ToxAV *toxAV, uint32_t friend_number, const int16_t *pcm, size_t sample_count,
+bool toxav_audio_send_frame(ToxAV *av, uint32_t friend_number, const int16_t *pcm, size_t sample_count,
                             uint8_t channels, uint32_t sampling_rate, TOXAV_ERR_SEND_FRAME *error);
 
 /**
@@ -719,7 +717,7 @@ bool toxav_audio_send_frame(ToxAV *toxAV, uint32_t friend_number, const int16_t
  * @param u U (Chroma) plane data.
  * @param v V (Chroma) plane data.
  */
-bool toxav_video_send_frame(ToxAV *toxAV, uint32_t friend_number, uint16_t width, uint16_t height, const uint8_t *y,
+bool toxav_video_send_frame(ToxAV *av, uint32_t friend_number, uint16_t width, uint16_t height, const uint8_t *y,
                             const uint8_t *u, const uint8_t *v, TOXAV_ERR_SEND_FRAME *error);
 
 
@@ -743,7 +741,7 @@ bool toxav_video_send_frame(ToxAV *toxAV, uint32_t friend_number, uint16_t width
  * @param sampling_rate Sampling rate used in this frame.
  *
  */
-typedef void toxav_audio_receive_frame_cb(ToxAV *toxAV, uint32_t friend_number, const int16_t *pcm, size_t sample_count,
+typedef void toxav_audio_receive_frame_cb(ToxAV *av, uint32_t friend_number, const int16_t *pcm, size_t sample_count,
         uint8_t channels, uint32_t sampling_rate, void *user_data);
 
 
@@ -751,7 +749,7 @@ typedef void toxav_audio_receive_frame_cb(ToxAV *toxAV, uint32_t friend_number,
  * Set the callback for the `audio_receive_frame` event. Pass NULL to unset.
  *
  */
-void toxav_callback_audio_receive_frame(ToxAV *toxAV, toxav_audio_receive_frame_cb *callback, void *user_data);
+void toxav_callback_audio_receive_frame(ToxAV *av, toxav_audio_receive_frame_cb *callback, void *user_data);
 
 /**
  * The function type for the video_receive_frame callback.
@@ -774,7 +772,7 @@ void toxav_callback_audio_receive_frame(ToxAV *toxAV, toxav_audio_receive_frame_
  *                image is bottom-up hence why you MUST abs() it when
  *                calculating plane buffer size.
  */
-typedef void toxav_video_receive_frame_cb(ToxAV *toxAV, uint32_t friend_number, uint16_t width, uint16_t height,
+typedef void toxav_video_receive_frame_cb(ToxAV *av, uint32_t friend_number, uint16_t width, uint16_t height,
         const uint8_t *y, const uint8_t *u, const uint8_t *v, int32_t ystride, int32_t ustride, int32_t vstride,
         void *user_data);
 
@@ -783,7 +781,7 @@ typedef void toxav_video_receive_frame_cb(ToxAV *toxAV, uint32_t friend_number,
  * Set the callback for the `video_receive_frame` event. Pass NULL to unset.
  *
  */
-void toxav_callback_video_receive_frame(ToxAV *toxAV, toxav_video_receive_frame_cb *callback, void *user_data);
+void toxav_callback_video_receive_frame(ToxAV *av, toxav_video_receive_frame_cb *callback, void *user_data);
 
 /**
  * NOTE Compatibility with old toxav group calls TODO remove
diff --git a/toxcore/assoc.h b/toxcore/assoc.h
index 62eecee1..e42e9c29 100644
--- a/toxcore/assoc.h
+++ b/toxcore/assoc.h
@@ -74,7 +74,7 @@ typedef struct Assoc_close_entries {
  *    the caller is assumed to be registered from Assoc_register_callback()
  *    if they aren't, they should copy the Client_data and call Assoc_client_drop()
  */
-uint8_t Assoc_get_close_entries(Assoc *assoc, Assoc_close_entries *close_entries);
+uint8_t Assoc_get_close_entries(Assoc *assoc, Assoc_close_entries *state);
 
 /*****************************************************************************/
 
@@ -91,7 +91,7 @@ Assoc *new_Assoc_default(Logger *log, const uint8_t *public_id);
 Assoc *new_Assoc(Logger *log, size_t bits, size_t entries, const uint8_t *public_id);
 
 /* public_id changed (loaded), update which entry isn't stored */
-void Assoc_self_client_id_changed(Assoc *assoc, const uint8_t *public_id);
+void Assoc_self_client_id_changed(Assoc *assoc, const uint8_t *id);
 
 /* every 45s send out a getnodes() for a "random" bucket */
 #define ASSOC_BUCKET_REFRESH 45
diff --git a/toxcore/net_crypto.h b/toxcore/net_crypto.h
index ce78e72f..9be71020 100644
--- a/toxcore/net_crypto.h
+++ b/toxcore/net_crypto.h
@@ -367,7 +367,7 @@ int get_random_tcp_con_number(Net_Crypto *c);
  * return 0 on success.
  * return -1 on failure.
  */
-int send_tcp_onion_request(Net_Crypto *c, unsigned int TCP_conn_number, const uint8_t *data, uint16_t length);
+int send_tcp_onion_request(Net_Crypto *c, unsigned int tcp_connections_number, const uint8_t *data, uint16_t length);
 
 /* Copy a maximum of num TCP relays we are connected to to tcp_relays.
  * NOTE that the family of the copied ip ports will be set to TCP_INET or TCP_INET6.
diff --git a/toxcore/tox.c b/toxcore/tox.c
index 960fb618..94cb7261 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -114,35 +114,36 @@ CONST_FUNCTION(file_id_length, FILE_ID_LENGTH)
 CONST_FUNCTION(max_filename_length, MAX_FILENAME_LENGTH)
 
 
-#define ACCESSORS(type, name) \
-type tox_options_get_##name(const struct Tox_Options *options) \
+#define ACCESSORS(type, ns, name) \
+type tox_options_get_##ns##name(const struct Tox_Options *options) \
 { \
-    return options->name; \
+    return options->ns##name; \
 } \
-void tox_options_set_##name(struct Tox_Options *options, type name) \
+void tox_options_set_##ns##name(struct Tox_Options *options, type name) \
 { \
-    options->name = name; \
+    options->ns##name = name; \
 }
 
-ACCESSORS(bool, ipv6_enabled)
-ACCESSORS(bool, udp_enabled)
-ACCESSORS(TOX_PROXY_TYPE, proxy_type)
-ACCESSORS(const char *, proxy_host)
-ACCESSORS(uint16_t, proxy_port)
-ACCESSORS(uint16_t, start_port)
-ACCESSORS(uint16_t, end_port)
-ACCESSORS(uint16_t, tcp_port)
-ACCESSORS(TOX_SAVEDATA_TYPE, savedata_type)
-ACCESSORS(size_t, savedata_length)
+ACCESSORS(bool, , ipv6_enabled)
+ACCESSORS(bool, , udp_enabled)
+ACCESSORS(TOX_PROXY_TYPE, proxy_ , type)
+ACCESSORS(const char *, proxy_ , host)
+ACCESSORS(uint16_t, proxy_ , port)
+ACCESSORS(uint16_t, , start_port)
+ACCESSORS(uint16_t, , end_port)
+ACCESSORS(uint16_t, , tcp_port)
+ACCESSORS(TOX_SAVEDATA_TYPE, savedata_, type)
+ACCESSORS(size_t, savedata_, length)
 
 const uint8_t *tox_options_get_savedata_data(const struct Tox_Options *options)
 {
     return options->savedata_data;
 }
 
-void tox_options_set_savedata_data(struct Tox_Options *options, const uint8_t *savedata_data, size_t length)
+void tox_options_set_savedata_data(struct Tox_Options *options, const uint8_t *data, size_t length)
 {
-    options->savedata_data = savedata_data;
+    options->savedata_data = data;
+    options->savedata_length = length;
 }
 
 
@@ -307,10 +308,10 @@ void tox_kill(Tox *tox)
     logger_kill(log);
 }
 
-void tox_callback_log(Tox *tox, tox_log_cb *function, void *userdata)
+void tox_callback_log(Tox *tox, tox_log_cb *callback, void *user_data)
 {
     Messenger *m = tox;
-    m_callback_log(m, (logger_cb *)function, userdata);
+    m_callback_log(m, (logger_cb *)callback, user_data);
 }
 
 size_t tox_get_savedata_size(const Tox *tox)
@@ -319,11 +320,11 @@ size_t tox_get_savedata_size(const Tox *tox)
     return messenger_size(m);
 }
 
-void tox_get_savedata(const Tox *tox, uint8_t *data)
+void tox_get_savedata(const Tox *tox, uint8_t *savedata)
 {
-    if (data) {
+    if (savedata) {
         const Messenger *m = tox;
-        messenger_save(m, data);
+        messenger_save(m, savedata);
     }
 }
 
@@ -457,10 +458,10 @@ TOX_CONNECTION tox_self_get_connection_status(const Tox *tox)
 }
 
 
-void tox_callback_self_connection_status(Tox *tox, tox_self_connection_status_cb *function)
+void tox_callback_self_connection_status(Tox *tox, tox_self_connection_status_cb *callback)
 {
     Messenger *m = tox;
-    m_callback_core_connection(m, function);
+    m_callback_core_connection(m, callback);
 }
 
 uint32_t tox_iteration_interval(const Tox *tox)
@@ -469,10 +470,10 @@ uint32_t tox_iteration_interval(const Tox *tox)
     return messenger_run_interval(m);
 }
 
-void tox_iterate(Tox *tox, void *userdata)
+void tox_iterate(Tox *tox, void *user_data)
 {
     Messenger *m = tox;
-    do_messenger(m, userdata);
+    do_messenger(m, user_data);
     do_groupchats(m->group_chat_object);
 }
 
@@ -548,16 +549,16 @@ void tox_self_get_name(const Tox *tox, uint8_t *name)
     }
 }
 
-bool tox_self_set_status_message(Tox *tox, const uint8_t *status, size_t length, TOX_ERR_SET_INFO *error)
+bool tox_self_set_status_message(Tox *tox, const uint8_t *status_message, size_t length, TOX_ERR_SET_INFO *error)
 {
-    if (!status && length != 0) {
+    if (!status_message && length != 0) {
         SET_ERROR_PARAMETER(error, TOX_ERR_SET_INFO_NULL);
         return 0;
     }
 
     Messenger *m = tox;
 
-    if (m_set_statusmessage(m, status, length) == 0) {
+    if (m_set_statusmessage(m, status_message, length) == 0) {
         SET_ERROR_PARAMETER(error, TOX_ERR_SET_INFO_OK);
         return 1;
     } else {
@@ -572,18 +573,18 @@ size_t tox_self_get_status_message_size(const Tox *tox)
     return m_get_self_statusmessage_size(m);
 }
 
-void tox_self_get_status_message(const Tox *tox, uint8_t *status)
+void tox_self_get_status_message(const Tox *tox, uint8_t *status_message)
 {
-    if (status) {
+    if (status_message) {
         const Messenger *m = tox;
-        m_copy_self_statusmessage(m, status);
+        m_copy_self_statusmessage(m, status_message);
     }
 }
 
-void tox_self_set_status(Tox *tox, TOX_USER_STATUS user_status)
+void tox_self_set_status(Tox *tox, TOX_USER_STATUS status)
 {
     Messenger *m = tox;
-    m_set_userstatus(m, user_status);
+    m_set_userstatus(m, status);
 }
 
 TOX_USER_STATUS tox_self_get_status(const Tox *tox)
@@ -743,12 +744,12 @@ size_t tox_self_get_friend_list_size(const Tox *tox)
     return count_friendlist(m);
 }
 
-void tox_self_get_friend_list(const Tox *tox, uint32_t *list)
+void tox_self_get_friend_list(const Tox *tox, uint32_t *friend_list)
 {
-    if (list) {
+    if (friend_list) {
         const Messenger *m = tox;
         //TODO: size parameter?
-        copy_friendlist(m, list, tox_self_get_friend_list_size(tox));
+        copy_friendlist(m, friend_list, tox_self_get_friend_list_size(tox));
     }
 }
 
@@ -785,10 +786,10 @@ bool tox_friend_get_name(const Tox *tox, uint32_t friend_number, uint8_t *name,
     return 1;
 }
 
-void tox_callback_friend_name(Tox *tox, tox_friend_name_cb *function)
+void tox_callback_friend_name(Tox *tox, tox_friend_name_cb *callback)
 {
     Messenger *m = tox;
-    m_callback_namechange(m, function);
+    m_callback_namechange(m, callback);
 }
 
 size_t tox_friend_get_status_message_size(const Tox *tox, uint32_t friend_number, TOX_ERR_FRIEND_QUERY *error)
@@ -805,17 +806,17 @@ size_t tox_friend_get_status_message_size(const Tox *tox, uint32_t friend_number
     return ret;
 }
 
-bool tox_friend_get_status_message(const Tox *tox, uint32_t friend_number, uint8_t *message,
+bool tox_friend_get_status_message(const Tox *tox, uint32_t friend_number, uint8_t *status_message,
                                    TOX_ERR_FRIEND_QUERY *error)
 {
-    if (!message) {
+    if (!status_message) {
         SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_QUERY_NULL);
         return 0;
     }
 
     const Messenger *m = tox;
     //TODO: size parameter?
-    int ret = m_copy_statusmessage(m, friend_number, message, m_get_statusmessage_size(m, friend_number));
+    int ret = m_copy_statusmessage(m, friend_number, status_message, m_get_statusmessage_size(m, friend_number));
 
     if (ret == -1) {
         SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND);
@@ -826,10 +827,10 @@ bool tox_friend_get_status_message(const Tox *tox, uint32_t friend_number, uint8
     return 1;
 }
 
-void tox_callback_friend_status_message(Tox *tox, tox_friend_status_message_cb *function)
+void tox_callback_friend_status_message(Tox *tox, tox_friend_status_message_cb *callback)
 {
     Messenger *m = tox;
-    m_callback_statusmessage(m, function);
+    m_callback_statusmessage(m, callback);
 }
 
 TOX_USER_STATUS tox_friend_get_status(const Tox *tox, uint32_t friend_number, TOX_ERR_FRIEND_QUERY *error)
@@ -847,10 +848,10 @@ TOX_USER_STATUS tox_friend_get_status(const Tox *tox, uint32_t friend_number, TO
     return ret;
 }
 
-void tox_callback_friend_status(Tox *tox, tox_friend_status_cb *function)
+void tox_callback_friend_status(Tox *tox, tox_friend_status_cb *callback)
 {
     Messenger *m = tox;
-    m_callback_userstatus(m, function);
+    m_callback_userstatus(m, callback);
 }
 
 TOX_CONNECTION tox_friend_get_connection_status(const Tox *tox, uint32_t friend_number, TOX_ERR_FRIEND_QUERY *error)
@@ -868,10 +869,10 @@ TOX_CONNECTION tox_friend_get_connection_status(const Tox *tox, uint32_t friend_
     return ret;
 }
 
-void tox_callback_friend_connection_status(Tox *tox, tox_friend_connection_status_cb *function, void *user_data)
+void tox_callback_friend_connection_status(Tox *tox, tox_friend_connection_status_cb *callback, void *user_data)
 {
     Messenger *m = tox;
-    m_callback_connectionstatus(m, function, user_data);
+    m_callback_connectionstatus(m, callback, user_data);
 }
 
 bool tox_friend_get_typing(const Tox *tox, uint32_t friend_number, TOX_ERR_FRIEND_QUERY *error)
@@ -888,17 +889,17 @@ bool tox_friend_get_typing(const Tox *tox, uint32_t friend_number, TOX_ERR_FRIEN
     return !!ret;
 }
 
-void tox_callback_friend_typing(Tox *tox, tox_friend_typing_cb *function)
+void tox_callback_friend_typing(Tox *tox, tox_friend_typing_cb *callback)
 {
     Messenger *m = tox;
-    m_callback_typingchange(m, function);
+    m_callback_typingchange(m, callback);
 }
 
-bool tox_self_set_typing(Tox *tox, uint32_t friend_number, bool is_typing, TOX_ERR_SET_TYPING *error)
+bool tox_self_set_typing(Tox *tox, uint32_t friend_number, bool typing, TOX_ERR_SET_TYPING *error)
 {
     Messenger *m = tox;
 
-    if (m_set_usertyping(m, friend_number, is_typing) == -1) {
+    if (m_set_usertyping(m, friend_number, typing) == -1) {
         SET_ERROR_PARAMETER(error, TOX_ERR_SET_TYPING_FRIEND_NOT_FOUND);
         return 0;
     }
@@ -955,22 +956,22 @@ uint32_t tox_friend_send_message(Tox *tox, uint32_t friend_number, TOX_MESSAGE_T
     return message_id;
 }
 
-void tox_callback_friend_read_receipt(Tox *tox, tox_friend_read_receipt_cb *function)
+void tox_callback_friend_read_receipt(Tox *tox, tox_friend_read_receipt_cb *callback)
 {
     Messenger *m = tox;
-    m_callback_read_receipt(m, function);
+    m_callback_read_receipt(m, callback);
 }
 
-void tox_callback_friend_request(Tox *tox, tox_friend_request_cb *function, void *user_data)
+void tox_callback_friend_request(Tox *tox, tox_friend_request_cb *callback, void *user_data)
 {
     Messenger *m = tox;
-    m_callback_friendrequest(m, function, user_data);
+    m_callback_friendrequest(m, callback, user_data);
 }
 
-void tox_callback_friend_message(Tox *tox, tox_friend_message_cb *function)
+void tox_callback_friend_message(Tox *tox, tox_friend_message_cb *callback)
 {
     Messenger *m = tox;
-    m_callback_friendmessage(m, function);
+    m_callback_friendmessage(m, callback);
 }
 
 bool tox_hash(uint8_t *hash, const uint8_t *data, size_t length)
@@ -1074,10 +1075,10 @@ bool tox_file_seek(Tox *tox, uint32_t friend_number, uint32_t file_number, uint6
     return 0;
 }
 
-void tox_callback_file_recv_control(Tox *tox, tox_file_recv_control_cb *function, void *user_data)
+void tox_callback_file_recv_control(Tox *tox, tox_file_recv_control_cb *callback, void *user_data)
 {
     Messenger *m = tox;
-    callback_file_control(m, function, user_data);
+    callback_file_control(m, callback, user_data);
 }
 
 bool tox_file_get_file_id(const Tox *tox, uint32_t friend_number, uint32_t file_number, uint8_t *file_id,
@@ -1194,22 +1195,22 @@ bool tox_file_send_chunk(Tox *tox, uint32_t friend_number, uint32_t file_number,
     return 0;
 }
 
-void tox_callback_file_chunk_request(Tox *tox, tox_file_chunk_request_cb *function, void *user_data)
+void tox_callback_file_chunk_request(Tox *tox, tox_file_chunk_request_cb *callback, void *user_data)
 {
     Messenger *m = tox;
-    callback_file_reqchunk(m, function, user_data);
+    callback_file_reqchunk(m, callback, user_data);
 }
 
-void tox_callback_file_recv(Tox *tox, tox_file_recv_cb *function, void *user_data)
+void tox_callback_file_recv(Tox *tox, tox_file_recv_cb *callback, void *user_data)
 {
     Messenger *m = tox;
-    callback_file_sendrequest(m, function, user_data);
+    callback_file_sendrequest(m, callback, user_data);
 }
 
-void tox_callback_file_recv_chunk(Tox *tox, tox_file_recv_chunk_cb *function, void *user_data)
+void tox_callback_file_recv_chunk(Tox *tox, tox_file_recv_chunk_cb *callback, void *user_data)
 {
     Messenger *m = tox;
-    callback_file_data(m, function, user_data);
+    callback_file_data(m, callback, user_data);
 }
 
 static void set_custom_packet_error(int ret, TOX_ERR_FRIEND_CUSTOM_PACKET *error)
@@ -1272,10 +1273,10 @@ bool tox_friend_send_lossy_packet(Tox *tox, uint32_t friend_number, const uint8_
     }
 }
 
-void tox_callback_friend_lossy_packet(Tox *tox, tox_friend_lossy_packet_cb *function, void *user_data)
+void tox_callback_friend_lossy_packet(Tox *tox, tox_friend_lossy_packet_cb *callback, void *user_data)
 {
     Messenger *m = tox;
-    custom_lossy_packet_registerhandler(m, function, user_data);
+    custom_lossy_packet_registerhandler(m, callback, user_data);
 }
 
 bool tox_friend_send_lossless_packet(Tox *tox, uint32_t friend_number, const uint8_t *data, size_t length,
@@ -1304,10 +1305,10 @@ bool tox_friend_send_lossless_packet(Tox *tox, uint32_t friend_number, const uin
     }
 }
 
-void tox_callback_friend_lossless_packet(Tox *tox, tox_friend_lossless_packet_cb *function, void *user_data)
+void tox_callback_friend_lossless_packet(Tox *tox, tox_friend_lossless_packet_cb *callback, void *user_data)
 {
     Messenger *m = tox;
-    custom_lossless_packet_registerhandler(m, function, user_data);
+    custom_lossless_packet_registerhandler(m, callback, user_data);
 }
 
 void tox_self_get_dht_id(const Tox *tox, uint8_t *dht_id)