astyled everything.

9 files changed, 16 insertions, 10 deletions

diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index f38ce3a5..84c00c70 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -1579,6 +1579,7 @@ void DHT_save(DHT *dht, uint8_t *data)
     len = num * sizeof(Client_data);
     type = DHT_STATE_TYPE_CLIENTS;
     data = z_state_save_subheader(data, len, type);
+
     if (num) {
         Client_data *clients = (Client_data *)data;
 
@@ -1586,6 +1587,7 @@ void DHT_save(DHT *dht, uint8_t *data)
             if (dht->close_clientlist[i].timestamp != 0)
                 memcpy(&clients[num++], &dht->close_clientlist[i], sizeof(Client_data));
     }
+
     data += len;
 }
 
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 0aacc703..d6bee5a1 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -788,7 +788,7 @@ int del_groupchat(Messenger *m, int groupnumber)
 
 /* Copy the name of peernumber who is in groupnumber to name.
  * name must be at least MAX_NICK_BYTES long.
- * 
+ *
  * return length of name if success
  * return -1 if failure
  */
@@ -802,6 +802,7 @@ int m_group_peername(Messenger *m, int groupnumber, int peernumber, uint8_t *nam
 
     if (m->chats[groupnumber] == NULL)
         return -1;
+
     return group_peername(m->chats[groupnumber], peernumber, name);
 }
 /* return 1 if that friend was invited to the group
@@ -1609,6 +1610,7 @@ static int messenger_load_state_callback(void *outer, uint8_t *data, uint32_t le
             break;
 
 #ifdef DEBUG
+
         default:
             fprintf(stderr, "Load state: contains unrecognized part (len %u, type %u)\n",
                     length, type);
diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h
index 2aabd90d..78580dc0 100644
--- a/toxcore/Messenger.h
+++ b/toxcore/Messenger.h
@@ -403,7 +403,7 @@ int del_groupchat(Messenger *m, int groupnumber);
 
 /* Copy the name of peernumber who is in groupnumber to name.
  * name must be at least MAX_NICK_BYTES long.
- * 
+ *
  * return length of name if success
  * return -1 if failure
  */
diff --git a/toxcore/group_chats.c b/toxcore/group_chats.c
index 23018cab..dc8e158b 100644
--- a/toxcore/group_chats.c
+++ b/toxcore/group_chats.c
@@ -281,7 +281,7 @@ static int delpeer(Group_Chat *chat, uint8_t *client_id)
 
 /* Copy the name of peernum to name.
  * name must be at least MAX_NICK_BYTES long.
- * 
+ *
  * return length of name if success
  * return -1 if failure
  */
@@ -289,10 +289,12 @@ int group_peername(Group_Chat *chat, int peernum, uint8_t *name)
 {
     if ((uint32_t)peernum >= chat->numpeers)
         return -1;
+
     if (chat->group[peernum].nick_len == 0) {
         memcpy(name, "NSA Agent", 10); /* Kindly remind the user that someone with no name might be a NSA agent.*/
         return 10;
     }
+
     memcpy(name, chat->group[peernum].nick, chat->group[peernum].nick_len);
     return chat->group[peernum].nick_len;
 }
diff --git a/toxcore/group_chats.h b/toxcore/group_chats.h
index 7089458c..e45f2af2 100644
--- a/toxcore/group_chats.h
+++ b/toxcore/group_chats.h
@@ -41,7 +41,7 @@ typedef struct {
     uint64_t    last_recv;
     uint64_t    last_recv_msgping;
     uint32_t    last_message_number;
-    
+
     uint8_t     nick[MAX_NICK_BYTES];
     uint16_t    nick_len;
 } Group_Peer;
@@ -72,7 +72,7 @@ typedef struct Group_Chat {
 
 /* Copy the name of peernum to name.
  * name must be at least MAX_NICK_BYTES long.
- * 
+ *
  * return length of name if success
  * return -1 if failure
  */
diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c
index 1de32cb0..a2e42557 100644
--- a/toxcore/net_crypto.c
+++ b/toxcore/net_crypto.c
@@ -456,7 +456,7 @@ int crypto_connect(Net_Crypto *c, uint8_t *public_key, IP_Port ip_port)
     }
 
     if (realloc_cryptoconnection(c, c->crypto_connections_length + 1) == -1
-        || c->crypto_connections == NULL)
+            || c->crypto_connections == NULL)
         return -1;
 
     memset(&(c->crypto_connections[c->crypto_connections_length]), 0, sizeof(Crypto_Connection));
@@ -580,7 +580,7 @@ int accept_crypto_inbound(Net_Crypto *c, int connection_id, uint8_t *public_key,
      * }
      */
     if (realloc_cryptoconnection(c, c->crypto_connections_length + 1) == -1
-        || c->crypto_connections == NULL)
+            || c->crypto_connections == NULL)
         return -1;
 
     memset(&(c->crypto_connections[c->crypto_connections_length]), 0, sizeof(Crypto_Connection));
diff --git a/toxcore/tox.c b/toxcore/tox.c
index 78074db1..4fba360b 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -410,7 +410,7 @@ int tox_del_groupchat(void *tox, int groupnumber)
 
 /* Copy the name of peernumber who is in groupnumber to name.
  * name must be at least MAX_NICK_BYTES long.
- * 
+ *
  * return length of name if success
  * return -1 if failure
  */
diff --git a/toxcore/tox.h b/toxcore/tox.h
index cc7fc5ec..b39008fe 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -378,7 +378,7 @@ int tox_del_groupchat(Tox *tox, int groupnumber);
 
 /* Copy the name of peernumber who is in groupnumber to name.
  * name must be at least TOX_MAX_NAME_LENGTH long.
- * 
+ *
  * return length of name if success
  * return -1 if failure
  */
diff --git a/toxcore/util.h b/toxcore/util.h
index 6937f7d4..9e4ac79a 100644
--- a/toxcore/util.h
+++ b/toxcore/util.h
@@ -18,7 +18,7 @@ void id_cpy(uint8_t *dest, uint8_t *src);
 
 typedef int (*load_state_callback_func)(void *outer, uint8_t *data, uint32_t len, uint16_t type);
 int load_state(load_state_callback_func load_state_callback, void *outer,
-                        uint8_t *data, uint32_t length, uint16_t cookie_inner);
+               uint8_t *data, uint32_t length, uint16_t cookie_inner);
 
 #undef LOGGING
 /* #define LOGGING */