Match parameter names in declarations with their definitions.

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

1 files changed, 71 insertions, 70 deletions

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)