cleanup: event length naming inconsistencies

Author: Green-Sky

other/event_tooling/generate_event_c.cpp

@@ -686,7 +686,7 @@ int main(int argc, char** argv) {
             {
                 EventTypeTrivial{"uint32_t", "group_number"},
                 EventTypeTrivial{"uint32_t", "peer_id"},
-                EventTypeByteRange{"name", "name_length", "length"}, // the latter two are ideally the same
+                EventTypeByteRange{"name", "name_length", "name_length"},
             }
         },
         {
@@ -702,7 +702,7 @@ int main(int argc, char** argv) {
             {
                 EventTypeTrivial{"uint32_t", "group_number"},
                 EventTypeTrivial{"uint32_t", "peer_id"},
-                EventTypeByteRange{"topic", "topic_length", "length"}, // the latter two are ideally the same
+                EventTypeByteRange{"topic", "topic_length", "topic_length"},
             }
         },
         {
@@ -737,7 +737,7 @@ int main(int argc, char** argv) {
             "Group_Password",
             {
                 EventTypeTrivial{"uint32_t", "group_number"},
-                EventTypeByteRange{"password", "password_length", "length"}, // the latter two are ideally the same
+                EventTypeByteRange{"password", "password_length", "password_length"},
             }
         },
         {
@@ -746,7 +746,7 @@ int main(int argc, char** argv) {
                 EventTypeTrivial{"uint32_t", "group_number"},
                 EventTypeTrivial{"uint32_t", "peer_id"},
                 EventTypeTrivial{"Tox_Message_Type", "type"},
-                EventTypeByteRange{"message", "message_length", "length"}, // the latter two are ideally the same
+                EventTypeByteRange{"message", "message_length", "message_length"},
                 EventTypeTrivial{"uint32_t", "message_id"},
             }
         },
@@ -756,7 +756,7 @@ int main(int argc, char** argv) {
                 EventTypeTrivial{"uint32_t", "group_number"},
                 EventTypeTrivial{"uint32_t", "peer_id"},
                 EventTypeTrivial{"Tox_Message_Type", "type"},
-                EventTypeByteRange{"message", "message_length", "length"}, // the latter two are ideally the same
+                EventTypeByteRange{"message", "message_length", "message_length"},
                 EventTypeTrivial{"uint32_t", "message_id"},
             }
         },
@@ -765,23 +765,23 @@ int main(int argc, char** argv) {
             {
                 EventTypeTrivial{"uint32_t", "group_number"},
                 EventTypeTrivial{"uint32_t", "peer_id"},
-                EventTypeByteRange{"data", "data_length", "length"}, // the latter two are ideally the same
+                EventTypeByteRange{"data", "data_length", "data_length"},
             }
         },
         {
             "Group_Custom_Private_Packet",
             {
                 EventTypeTrivial{"uint32_t", "group_number"},
                 EventTypeTrivial{"uint32_t", "peer_id"},
-                EventTypeByteRange{"data", "data_length", "length"}, // the latter two are ideally the same
+                EventTypeByteRange{"data", "data_length", "data_length"},
             }
         },
         {
             "Group_Invite",
             {
                 EventTypeTrivial{"uint32_t", "friend_number"},
-                EventTypeByteRange{"invite_data", "invite_data_length", "length"}, // the latter two are ideally the same
-                EventTypeByteRange{"group_name", "group_name_length", "group_name_length"}, // they are :)
+                EventTypeByteRange{"invite_data", "invite_data_length", "invite_data_length"},
+                EventTypeByteRange{"group_name", "group_name_length", "group_name_length"},
             }
         },
         {
@@ -797,8 +797,8 @@ int main(int argc, char** argv) {
                 EventTypeTrivial{"uint32_t", "group_number"},
                 EventTypeTrivial{"uint32_t", "peer_id"},
                 EventTypeTrivial{"Tox_Group_Exit_Type", "exit_type"},
-                EventTypeByteRange{"name", "name_length", "name_length"}, // they are :)
-                EventTypeByteRange{"part_message", "part_message_length", "part_message_length"}, // they are :)
+                EventTypeByteRange{"name", "name_length", "name_length"},
+                EventTypeByteRange{"part_message", "part_message_length", "part_message_length"},
             }
         },
         {

toxcore/events/group_custom_packet.c

@@ -220,7 +220,7 @@ static Tox_Event_Group_Custom_Packet *tox_event_group_custom_packet_alloc(void *
  *****************************************************/
 
 void tox_events_handle_group_custom_packet(
-    Tox *tox, uint32_t group_number, uint32_t peer_id, const uint8_t *data, size_t length,
+    Tox *tox, uint32_t group_number, uint32_t peer_id, const uint8_t *data, size_t data_length,
     void *user_data)
 {
     Tox_Event_Group_Custom_Packet *group_custom_packet = tox_event_group_custom_packet_alloc(user_data);
@@ -231,5 +231,5 @@ void tox_events_handle_group_custom_packet(
 
     tox_event_group_custom_packet_set_group_number(group_custom_packet, group_number);
     tox_event_group_custom_packet_set_peer_id(group_custom_packet, peer_id);
-    tox_event_group_custom_packet_set_data(group_custom_packet, data, length);
+    tox_event_group_custom_packet_set_data(group_custom_packet, data, data_length);
 }

toxcore/events/group_custom_private_packet.c

@@ -220,7 +220,7 @@ static Tox_Event_Group_Custom_Private_Packet *tox_event_group_custom_private_pac
  *****************************************************/
 
 void tox_events_handle_group_custom_private_packet(
-    Tox *tox, uint32_t group_number, uint32_t peer_id, const uint8_t *data, size_t length,
+    Tox *tox, uint32_t group_number, uint32_t peer_id, const uint8_t *data, size_t data_length,
     void *user_data)
 {
     Tox_Event_Group_Custom_Private_Packet *group_custom_private_packet = tox_event_group_custom_private_packet_alloc(user_data);
@@ -231,5 +231,5 @@ void tox_events_handle_group_custom_private_packet(
 
     tox_event_group_custom_private_packet_set_group_number(group_custom_private_packet, group_number);
     tox_event_group_custom_private_packet_set_peer_id(group_custom_private_packet, peer_id);
-    tox_event_group_custom_private_packet_set_data(group_custom_private_packet, data, length);
+    tox_event_group_custom_private_packet_set_data(group_custom_private_packet, data, data_length);
 }

toxcore/events/group_invite.c

@@ -248,7 +248,7 @@ static Tox_Event_Group_Invite *tox_event_group_invite_alloc(void *user_data)
  *****************************************************/
 
 void tox_events_handle_group_invite(
-    Tox *tox, uint32_t friend_number, const uint8_t *invite_data, size_t length, const uint8_t *group_name, size_t group_name_length,
+    Tox *tox, uint32_t friend_number, const uint8_t *invite_data, size_t invite_data_length, const uint8_t *group_name, size_t group_name_length,
     void *user_data)
 {
     Tox_Event_Group_Invite *group_invite = tox_event_group_invite_alloc(user_data);
@@ -258,6 +258,6 @@ void tox_events_handle_group_invite(
     }
 
     tox_event_group_invite_set_friend_number(group_invite, friend_number);
-    tox_event_group_invite_set_invite_data(group_invite, invite_data, length);
+    tox_event_group_invite_set_invite_data(group_invite, invite_data, invite_data_length);
     tox_event_group_invite_set_group_name(group_invite, group_name, group_name_length);
 }

toxcore/events/group_message.c

@@ -254,7 +254,7 @@ static Tox_Event_Group_Message *tox_event_group_message_alloc(void *user_data)
  *****************************************************/
 
 void tox_events_handle_group_message(
-    Tox *tox, uint32_t group_number, uint32_t peer_id, Tox_Message_Type type, const uint8_t *message, size_t length, uint32_t message_id,
+    Tox *tox, uint32_t group_number, uint32_t peer_id, Tox_Message_Type type, const uint8_t *message, size_t message_length, uint32_t message_id,
     void *user_data)
 {
     Tox_Event_Group_Message *group_message = tox_event_group_message_alloc(user_data);
@@ -266,6 +266,6 @@ void tox_events_handle_group_message(
     tox_event_group_message_set_group_number(group_message, group_number);
     tox_event_group_message_set_peer_id(group_message, peer_id);
     tox_event_group_message_set_type(group_message, type);
-    tox_event_group_message_set_message(group_message, message, length);
+    tox_event_group_message_set_message(group_message, message, message_length);
     tox_event_group_message_set_message_id(group_message, message_id);
 }

toxcore/events/group_password.c

@@ -204,7 +204,7 @@ static Tox_Event_Group_Password *tox_event_group_password_alloc(void *user_data)
  *****************************************************/
 
 void tox_events_handle_group_password(
-    Tox *tox, uint32_t group_number, const uint8_t *password, size_t length,
+    Tox *tox, uint32_t group_number, const uint8_t *password, size_t password_length,
     void *user_data)
 {
     Tox_Event_Group_Password *group_password = tox_event_group_password_alloc(user_data);
@@ -214,5 +214,5 @@ void tox_events_handle_group_password(
     }
 
     tox_event_group_password_set_group_number(group_password, group_number);
-    tox_event_group_password_set_password(group_password, password, length);
+    tox_event_group_password_set_password(group_password, password, password_length);
 }

toxcore/events/group_peer_name.c

@@ -220,7 +220,7 @@ static Tox_Event_Group_Peer_Name *tox_event_group_peer_name_alloc(void *user_dat
  *****************************************************/
 
 void tox_events_handle_group_peer_name(
-    Tox *tox, uint32_t group_number, uint32_t peer_id, const uint8_t *name, size_t length,
+    Tox *tox, uint32_t group_number, uint32_t peer_id, const uint8_t *name, size_t name_length,
     void *user_data)
 {
     Tox_Event_Group_Peer_Name *group_peer_name = tox_event_group_peer_name_alloc(user_data);
@@ -231,5 +231,5 @@ void tox_events_handle_group_peer_name(
 
     tox_event_group_peer_name_set_group_number(group_peer_name, group_number);
     tox_event_group_peer_name_set_peer_id(group_peer_name, peer_id);
-    tox_event_group_peer_name_set_name(group_peer_name, name, length);
+    tox_event_group_peer_name_set_name(group_peer_name, name, name_length);
 }

toxcore/events/group_private_message.c

@@ -254,7 +254,7 @@ static Tox_Event_Group_Private_Message *tox_event_group_private_message_alloc(vo
  *****************************************************/
 
 void tox_events_handle_group_private_message(
-    Tox *tox, uint32_t group_number, uint32_t peer_id, Tox_Message_Type type, const uint8_t *message, size_t length, uint32_t message_id,
+    Tox *tox, uint32_t group_number, uint32_t peer_id, Tox_Message_Type type, const uint8_t *message, size_t message_length, uint32_t message_id,
     void *user_data)
 {
     Tox_Event_Group_Private_Message *group_private_message = tox_event_group_private_message_alloc(user_data);
@@ -266,6 +266,6 @@ void tox_events_handle_group_private_message(
     tox_event_group_private_message_set_group_number(group_private_message, group_number);
     tox_event_group_private_message_set_peer_id(group_private_message, peer_id);
     tox_event_group_private_message_set_type(group_private_message, type);
-    tox_event_group_private_message_set_message(group_private_message, message, length);
+    tox_event_group_private_message_set_message(group_private_message, message, message_length);
     tox_event_group_private_message_set_message_id(group_private_message, message_id);
 }

toxcore/events/group_topic.c

@@ -220,7 +220,7 @@ static Tox_Event_Group_Topic *tox_event_group_topic_alloc(void *user_data)
  *****************************************************/
 
 void tox_events_handle_group_topic(
-    Tox *tox, uint32_t group_number, uint32_t peer_id, const uint8_t *topic, size_t length,
+    Tox *tox, uint32_t group_number, uint32_t peer_id, const uint8_t *topic, size_t topic_length,
     void *user_data)
 {
     Tox_Event_Group_Topic *group_topic = tox_event_group_topic_alloc(user_data);
@@ -231,5 +231,5 @@ void tox_events_handle_group_topic(
 
     tox_event_group_topic_set_group_number(group_topic, group_number);
     tox_event_group_topic_set_peer_id(group_topic, peer_id);
-    tox_event_group_topic_set_topic(group_topic, topic, length);
+    tox_event_group_topic_set_topic(group_topic, topic, topic_length);
 }

toxcore/tox.h

@@ -4094,11 +4094,11 @@ bool tox_group_peer_get_public_key(
  * @param group_number The group number of the group the name change is intended for.
  * @param peer_id The ID of the peer who has changed their name.
  * @param name The name data.
- * @param length The length of the name.
+ * @param name_length The length of the name.
  */
 typedef void tox_group_peer_name_cb(
     Tox *tox, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id,
-    const uint8_t name[], size_t length, void *user_data);
+    const uint8_t name[], size_t name_length, void *user_data);
 
 /**
  * Set the callback for the `group_peer_name` event. Pass NULL to unset.
@@ -4235,11 +4235,11 @@ bool tox_group_get_topic(
  * @param peer_id The ID of the peer who changed the topic. If the peer who set the topic
  *   is not present in our peer list this value will be set to 0.
  * @param topic The topic data.
- * @param length The topic length.
+ * @param topic_length The topic length.
  */
 typedef void tox_group_topic_cb(
     Tox *tox, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id,
-    const uint8_t topic[], size_t length,
+    const uint8_t topic[], size_t topic_length,
     void *user_data);
 
 /**
@@ -4416,11 +4416,11 @@ bool tox_group_get_password(
 /**
  * @param group_number The group number of the group for which the password has changed.
  * @param password The new group password.
- * @param length The length of the password.
+ * @param password_length The length of the password.
  */
 typedef void tox_group_password_cb(
     Tox *tox, Tox_Group_Number group_number,
-    const uint8_t password[], size_t length,
+    const uint8_t password[], size_t password_length,
     void *user_data);
 
 /**
@@ -4731,12 +4731,12 @@ bool tox_group_send_custom_private_packet(const Tox *tox, Tox_Group_Number group
  * @param peer_id The ID of the peer who sent the message.
  * @param type The type of message (normal, action, ...).
  * @param message The message data.
+ * @param message_length The length of the message.
  * @param message_id A pseudo message id that clients can use to uniquely identify this group message.
- * @param length The length of the message.
  */
 typedef void tox_group_message_cb(
     Tox *tox, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id, Tox_Message_Type type,
-    const uint8_t message[], size_t length, Tox_Group_Message_Id message_id, void *user_data);
+    const uint8_t message[], size_t message_length, Tox_Group_Message_Id message_id, void *user_data);
 
 /**
  * Set the callback for the `group_message` event. Pass NULL to unset.
@@ -4749,11 +4749,12 @@ void tox_callback_group_message(Tox *tox, tox_group_message_cb *callback);
  * @param group_number The group number of the group the private message is intended for.
  * @param peer_id The ID of the peer who sent the private message.
  * @param message The message data.
- * @param length The length of the message.
+ * @param message_length The length of the message.
+ * @param message_id A pseudo message id that clients can use to uniquely identify this group message.
  */
 typedef void tox_group_private_message_cb(
     Tox *tox, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id, Tox_Message_Type type,
-    const uint8_t message[], size_t length, Tox_Group_Message_Id message_id, void *user_data);
+    const uint8_t message[], size_t message_length, Tox_Group_Message_Id message_id, void *user_data);
 
 /**
  * Set the callback for the `group_private_message` event. Pass NULL to unset.
@@ -4766,11 +4767,11 @@ void tox_callback_group_private_message(Tox *tox, tox_group_private_message_cb *
  * @param group_number The group number of the group the packet is intended for.
  * @param peer_id The ID of the peer who sent the packet.
  * @param data The packet data.
- * @param length The length of the data.
+ * @param data_length The length of the data.
  */
 typedef void tox_group_custom_packet_cb(
     Tox *tox, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id,
-    const uint8_t data[], size_t length, void *user_data);
+    const uint8_t data[], size_t data_length, void *user_data);
 
 /**
  * Set the callback for the `group_custom_packet` event. Pass NULL to unset.
@@ -4783,11 +4784,11 @@ void tox_callback_group_custom_packet(Tox *tox, tox_group_custom_packet_cb *call
  * @param group_number The group number of the group the packet is intended for.
  * @param peer_id The ID of the peer who sent the packet.
  * @param data The packet data.
- * @param length The length of the data.
+ * @param data_length The length of the data.
  */
 typedef void tox_group_custom_private_packet_cb(
     Tox *tox, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id,
-    const uint8_t data[], size_t length, void *user_data);
+    const uint8_t data[], size_t data_length, void *user_data);
 
 /**
  * Set the callback for the `group_custom_private_packet` event. Pass NULL to unset.
@@ -4923,11 +4924,11 @@ Tox_Group_Number tox_group_invite_accept(
 /**
  * @param friend_number The friend number of the contact who sent the invite.
  * @param invite_data The invite data.
- * @param length The length of invite_data.
+ * @param invite_data_length The length of invite_data.
  */
 typedef void tox_group_invite_cb(
     Tox *tox, Tox_Friend_Number friend_number,
-    const uint8_t invite_data[], size_t length,
+    const uint8_t invite_data[], size_t invite_data_length,
     const uint8_t group_name[], size_t group_name_length,
     void *user_data);