Make tox.c unambiguously parseable.

Rules:
1. Constants are uppercase names: THE_CONSTANT.
2. SUE[1] types start with an uppercase letter and have at least one
   lowercase letter in it: The_Type, THE_Type.
3. Function types end in "_cb": tox_friend_connection_cb.
4. Variable and function names are all lowercase: the_function.

This makes it easier for humans reading the code to determine what an
identifier means. I'm not convinced by the enum type name change, but I
don't know a better rule. Currently, a lot of enum types are spelled like
constants, which is confusing.

[1] struct/union/enum

1 files changed, 44 insertions, 26 deletions

diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h
index 402eb916..47025fcc 100644
--- a/toxcore/Messenger.h
+++ b/toxcore/Messenger.h
@@ -136,8 +136,7 @@ typedef enum {
     USERSTATUS_AWAY,
     USERSTATUS_BUSY,
     USERSTATUS_INVALID
-}
-USERSTATUS;
+} Userstatus;
 
 #define FILE_ID_LENGTH 32
 
@@ -181,6 +180,26 @@ enum {
 
 typedef struct Messenger Messenger;
 
+typedef void m_self_connection_status_cb(Messenger *, unsigned int, void *);
+typedef void m_friend_status_cb(Messenger *, uint32_t, unsigned int, void *);
+typedef void m_friend_connection_status_cb(Messenger *, uint32_t, unsigned int, void *);
+typedef void m_friend_message_cb(Messenger *, uint32_t, unsigned int, const uint8_t *, size_t, void *);
+typedef void m_file_recv_control_cb(Messenger *, uint32_t, uint32_t, unsigned int, void *);
+typedef void m_friend_request_cb(Messenger *, const uint8_t *, const uint8_t *, size_t, void *);
+typedef void m_friend_name_cb(Messenger *m, uint32_t, const uint8_t *, size_t, void *);
+typedef void m_friend_status_message_cb(Messenger *m, uint32_t, const uint8_t *, size_t, void *);
+typedef void m_friend_typing_cb(Messenger *m, uint32_t, bool, void *);
+typedef void m_friend_read_receipt_cb(Messenger *m, uint32_t, uint32_t, void *);
+typedef void m_file_recv_cb(Messenger *m, uint32_t, uint32_t, uint32_t, uint64_t, const uint8_t *, size_t, void *);
+typedef void m_file_chunk_request_cb(Messenger *m, uint32_t, uint32_t, uint64_t, size_t, void *);
+typedef void m_file_recv_chunk_cb(Messenger *m, uint32_t, uint32_t, uint64_t, const uint8_t *, size_t, void *);
+typedef void m_friend_lossy_packet_cb(Messenger *m, uint32_t, const uint8_t *, size_t, void *);
+typedef void m_friend_lossless_packet_cb(Messenger *m, uint32_t, const uint8_t *, size_t, void *);
+typedef void m_friend_connectionstatuschange_internal_cb(Messenger *m, uint32_t, uint8_t, void *);
+typedef void m_conference_invite_cb(Messenger *m, uint32_t, const uint8_t *, uint16_t, void *);
+typedef void m_msi_packet_cb(Messenger *m, uint32_t, const uint8_t *, uint16_t, void *);
+typedef int m_lossy_rtp_packet_cb(Messenger *m, uint32_t friendnumber, const uint8_t *data, uint16_t len, void *object);
+
 typedef struct {
     uint8_t real_pk[CRYPTO_PUBLIC_KEY_SIZE];
     int friendcon_id;
@@ -195,7 +214,7 @@ typedef struct {
     uint8_t statusmessage[MAX_STATUSMESSAGE_LENGTH];
     uint16_t statusmessage_length;
     uint8_t statusmessage_sent;
-    USERSTATUS userstatus;
+    Userstatus userstatus;
     uint8_t userstatus_sent;
     uint8_t user_istyping;
     uint8_t user_istyping_sent;
@@ -210,7 +229,7 @@ typedef struct {
     struct File_Transfers file_receiving[MAX_CONCURRENT_FILE_PIPES];
 
     struct {
-        int (*function)(Messenger *m, uint32_t friendnumber, const uint8_t *data, uint16_t len, void *object);
+        m_lossy_rtp_packet_cb *function;
         void *object;
     } lossy_rtp_packethandlers[PACKET_LOSSY_AV_RESERVED];
 
@@ -239,7 +258,7 @@ struct Messenger {
     uint8_t statusmessage[MAX_STATUSMESSAGE_LENGTH];
     uint16_t statusmessage_length;
 
-    USERSTATUS userstatus;
+    Userstatus userstatus;
 
     Friend *friendlist;
     uint32_t numfriends;
@@ -249,32 +268,31 @@ struct Messenger {
     uint8_t has_added_relays; // If the first connection has occurred in do_messenger
     Node_format loaded_relays[NUM_SAVED_TCP_RELAYS]; // Relays loaded from config
 
-    void (*friend_message)(struct Messenger *m, uint32_t, unsigned int, const uint8_t *, size_t, void *);
-    void (*friend_namechange)(struct Messenger *m, uint32_t, const uint8_t *, size_t, void *);
-    void (*friend_statusmessagechange)(struct Messenger *m, uint32_t, const uint8_t *, size_t, void *);
-    void (*friend_userstatuschange)(struct Messenger *m, uint32_t, unsigned int, void *);
-    void (*friend_typingchange)(struct Messenger *m, uint32_t, bool, void *);
-    void (*read_receipt)(struct Messenger *m, uint32_t, uint32_t, void *);
-    void (*friend_connectionstatuschange)(struct Messenger *m, uint32_t, unsigned int, void *);
-    void (*friend_connectionstatuschange_internal)(struct Messenger *m, uint32_t, uint8_t, void *);
+    m_friend_message_cb *friend_message;
+    m_friend_name_cb *friend_namechange;
+    m_friend_status_message_cb *friend_statusmessagechange;
+    m_friend_status_cb *friend_userstatuschange;
+    m_friend_typing_cb *friend_typingchange;
+    m_friend_read_receipt_cb *read_receipt;
+    m_friend_connection_status_cb *friend_connectionstatuschange;
+    m_friend_connectionstatuschange_internal_cb *friend_connectionstatuschange_internal;
     void *friend_connectionstatuschange_internal_userdata;
 
     void *conferences_object; /* Set by new_groupchats()*/
-    void (*conference_invite)(struct Messenger *m, uint32_t, const uint8_t *, uint16_t, void *);
+    m_conference_invite_cb *conference_invite;
 
-    void (*file_sendrequest)(struct Messenger *m, uint32_t, uint32_t, uint32_t, uint64_t, const uint8_t *, size_t,
-                             void *);
-    void (*file_filecontrol)(struct Messenger *m, uint32_t, uint32_t, unsigned int, void *);
-    void (*file_filedata)(struct Messenger *m, uint32_t, uint32_t, uint64_t, const uint8_t *, size_t, void *);
-    void (*file_reqchunk)(struct Messenger *m, uint32_t, uint32_t, uint64_t, size_t, void *);
+    m_file_recv_cb *file_sendrequest;
+    m_file_recv_control_cb *file_filecontrol;
+    m_file_recv_chunk_cb *file_filedata;
+    m_file_chunk_request_cb *file_reqchunk;
 
-    void (*msi_packet)(struct Messenger *m, uint32_t, const uint8_t *, uint16_t, void *);
+    m_msi_packet_cb *msi_packet;
     void *msi_packet_userdata;
 
-    void (*lossy_packethandler)(struct Messenger *m, uint32_t, const uint8_t *, size_t, void *);
-    void (*lossless_packethandler)(struct Messenger *m, uint32_t, const uint8_t *, size_t, void *);
+    m_friend_lossy_packet_cb *lossy_packethandler;
+    m_friend_lossless_packet_cb *lossless_packethandler;
 
-    void (*core_connection_change)(struct Messenger *m, unsigned int, void *);
+    m_self_connection_status_cb *core_connection_change;
     unsigned int last_connection_status;
 
     Messenger_Options options;
@@ -440,9 +458,9 @@ int m_get_self_statusmessage_size(const Messenger *m);
 int m_copy_statusmessage(const Messenger *m, int32_t friendnumber, uint8_t *buf, uint32_t maxlen);
 int m_copy_self_statusmessage(const Messenger *m, uint8_t *buf);
 
-/*  return one of USERSTATUS values.
+/*  return one of Userstatus values.
  *  Values unknown to your application should be represented as USERSTATUS_NONE.
- *  As above, the self variant will return our own USERSTATUS.
+ *  As above, the self variant will return our own Userstatus.
  *  If friendnumber is invalid, this shall return USERSTATUS_INVALID.
  */
 uint8_t m_get_userstatus(const Messenger *m, int32_t friendnumber);
@@ -499,7 +517,7 @@ void m_callback_namechange(Messenger *m, void (*function)(Messenger *m, uint32_t
 void m_callback_statusmessage(Messenger *m, void (*function)(Messenger *m, uint32_t, const uint8_t *, size_t, void *));
 
 /* Set the callback for status type changes.
- *  Function(uint32_t friendnumber, USERSTATUS kind)
+ *  Function(uint32_t friendnumber, Userstatus kind)
  */
 void m_callback_userstatus(Messenger *m, void (*function)(Messenger *m, uint32_t, unsigned int, void *));