Use named function types for callbacks in net_crypto.

Also:
* compound statements (blocks, e.g. in if/else) must be non-empty.
  Comments don't count.
* `=` is not allowed in subexpressions. We treat it as statement-only.
* `++i` is preferred over `i++` in statements.
* `Type_Names` are camelsnake-case.

1 files changed, 15 insertions, 13 deletions

diff --git a/toxcore/net_crypto.h b/toxcore/net_crypto.h
index e6a4efd7..2ed35883 100644
--- a/toxcore/net_crypto.h
+++ b/toxcore/net_crypto.h
@@ -31,13 +31,13 @@
 
 #include <pthread.h>
 
-typedef enum CRYPTO_CONN_STATE {
+typedef enum Crypto_Conn_State {
     CRYPTO_CONN_NO_CONNECTION = 0,
     CRYPTO_CONN_COOKIE_REQUESTING = 1,  // send cookie request packets
     CRYPTO_CONN_HANDSHAKE_SENT = 2,     // send handshake packets
     CRYPTO_CONN_NOT_CONFIRMED = 3,      // send handshake packets, we have received one from the other
     CRYPTO_CONN_ESTABLISHED = 4,
-} CRYPTO_CONN_STATE;
+} Crypto_Conn_State;
 
 /* Maximum size of receiving and sending packet buffers. */
 #define CRYPTO_PACKET_BUFFER_SIZE 32768 /* Must be a power of 2 */
@@ -108,14 +108,19 @@ typedef struct New_Connection {
     uint8_t cookie_length;
 } New_Connection;
 
+typedef int connection_status_cb(void *object, int id, uint8_t status, void *userdata);
+typedef int connection_data_cb(void *object, int id, const uint8_t *data, uint16_t length, void *userdata);
+typedef int connection_lossy_data_cb(void *object, int id, const uint8_t *data, uint16_t length, void *userdata);
+typedef void dht_pk_cb(void *data, int32_t number, const uint8_t *dht_public_key, void *userdata);
+typedef int new_connection_cb(void *object, New_Connection *n_c);
+
 /* Set function to be called when someone requests a new connection to us.
  *
  * The set function should return -1 on failure and 0 on success.
  *
  * n_c is only valid for the duration of the function call.
  */
-void new_connection_handler(Net_Crypto *c, int (*new_connection_callback)(void *object, New_Connection *n_c),
-                            void *object);
+void new_connection_handler(Net_Crypto *c, new_connection_cb *new_connection_callback, void *object);
 
 /* Accept a crypto connection.
  *
@@ -152,7 +157,7 @@ int set_direct_ip_port(Net_Crypto *c, int crypt_connection_id, IP_Port ip_port,
  * return 0 on success.
  */
 int connection_status_handler(const Net_Crypto *c, int crypt_connection_id,
-                              int (*connection_status_callback)(void *object, int id, uint8_t status, void *userdata), void *object, int id);
+                              connection_status_cb *connection_status_callback, void *object, int id);
 
 /* Set function to be called when connection with crypt_connection_id receives a lossless data packet of length.
  *
@@ -162,8 +167,8 @@ int connection_status_handler(const Net_Crypto *c, int crypt_connection_id,
  * return -1 on failure.
  * return 0 on success.
  */
-int connection_data_handler(const Net_Crypto *c, int crypt_connection_id, int (*connection_data_callback)(void *object,
-                            int id, const uint8_t *data, uint16_t length, void *userdata), void *object, int id);
+int connection_data_handler(const Net_Crypto *c, int crypt_connection_id,
+                            connection_data_cb *connection_data_callback, void *object, int id);
 
 
 /* Set function to be called when connection with crypt_connection_id receives a lossy data packet of length.
@@ -175,9 +180,7 @@ int connection_data_handler(const Net_Crypto *c, int crypt_connection_id, int (*
  * return 0 on success.
  */
 int connection_lossy_data_handler(Net_Crypto *c, int crypt_connection_id,
-                                  int (*connection_lossy_data_callback)(void *object, int id, const uint8_t *data, uint16_t length, void *userdata),
-                                  void *object,
-                                  int id);
+                                  connection_lossy_data_cb *connection_lossy_data_callback, void *object, int id);
 
 /* Set the function for this friend that will be callbacked with object and number if
  * the friend sends us a different dht public key than we have associated to him.
@@ -189,8 +192,7 @@ int connection_lossy_data_handler(Net_Crypto *c, int crypt_connection_id,
  * return -1 on failure.
  * return 0 on success.
  */
-int nc_dht_pk_callback(Net_Crypto *c, int crypt_connection_id, void (*function)(void *data, int32_t number,
-                       const uint8_t *dht_public_key, void *userdata), void *object, uint32_t number);
+int nc_dht_pk_callback(Net_Crypto *c, int crypt_connection_id, dht_pk_cb *function, void *object, uint32_t number);
 
 /* returns the number of packet slots left in the sendbuffer.
  * return 0 if failure.
@@ -278,7 +280,7 @@ int crypto_kill(Net_Crypto *c, int crypt_connection_id);
  * sets direct_connected to 1 if connection connects directly to other, 0 if it isn't.
  * sets online_tcp_relays to the number of connected tcp relays this connection has.
  */
-CRYPTO_CONN_STATE crypto_connection_status(const Net_Crypto *c, int crypt_connection_id, bool *direct_connected,
+Crypto_Conn_State crypto_connection_status(const Net_Crypto *c, int crypt_connection_id, bool *direct_connected,
         unsigned int *online_tcp_relays);
 
 /* Generate our public and private keys.