Add some astyle options to make it do more.

It now enforces a bit more formatting. In particular, padding inside
parentheses is removed. I would like it to remove padding after unary
operators, but there seems to be no option for that.

7 files changed, 51 insertions, 42 deletions

diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index beff0499..7e2445b3 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -642,7 +642,7 @@ static void get_close_nodes_inner(const uint8_t *public_key, Node_format *nodes_
         if (num_nodes < MAX_SENT_NODES) {
             memcpy(nodes_list[num_nodes].public_key,
                    client->public_key,
-                   crypto_box_PUBLICKEYBYTES );
+                   crypto_box_PUBLICKEYBYTES);
 
             nodes_list[num_nodes].ip_port = ipptp->ip_port;
             num_nodes++;
@@ -827,11 +827,11 @@ static void sort_client_list(Client_data *list, unsigned int length, const uint8
  *  than public_key.
  *
  *  returns True(1) when the item was stored, False(0) otherwise */
-static int replace_all(   Client_data    *list,
-                          uint16_t        length,
-                          const uint8_t  *public_key,
-                          IP_Port         ip_port,
-                          const uint8_t  *comp_public_key )
+static int replace_all(Client_data    *list,
+                       uint16_t        length,
+                       const uint8_t  *public_key,
+                       IP_Port         ip_port,
+                       const uint8_t  *comp_public_key)
 {
     if ((ip_port.ip.family != AF_INET) && (ip_port.ip.family != AF_INET6)) {
         return 0;
@@ -1197,11 +1197,11 @@ static int getnodes(DHT *dht, IP_Port ip_port, const uint8_t *public_key, const
     uint8_t nonce[crypto_box_NONCEBYTES];
     new_nonce(nonce);
 
-    int len = encrypt_data_symmetric( shared_key,
-                                      nonce,
-                                      plain,
-                                      sizeof(plain),
-                                      encrypt );
+    int len = encrypt_data_symmetric(shared_key,
+                                     nonce,
+                                     plain,
+                                     sizeof(plain),
+                                     encrypt);
 
     if (len != sizeof(encrypt)) {
         return -1;
@@ -1252,11 +1252,11 @@ static int sendnodes_ipv6(const DHT *dht, IP_Port ip_port, const uint8_t *public
 
     plain[0] = num_nodes;
     memcpy(plain + 1 + nodes_length, sendback_data, length);
-    int len = encrypt_data_symmetric( shared_encryption_key,
-                                      nonce,
-                                      plain,
-                                      1 + nodes_length + length,
-                                      encrypt );
+    int len = encrypt_data_symmetric(shared_encryption_key,
+                                     nonce,
+                                     plain,
+                                     1 + nodes_length + length,
+                                     encrypt);
 
     if (len != 1 + nodes_length + length + crypto_box_MACBYTES) {
         return -1;
@@ -1288,11 +1288,11 @@ static int handle_getnodes(void *object, IP_Port source, const uint8_t *packet,
     uint8_t shared_key[crypto_box_BEFORENMBYTES];
 
     DHT_get_shared_key_recv(dht, shared_key, packet + 1);
-    int len = decrypt_data_symmetric( shared_key,
-                                      packet + 1 + crypto_box_PUBLICKEYBYTES,
-                                      packet + 1 + crypto_box_PUBLICKEYBYTES + crypto_box_NONCEBYTES,
-                                      crypto_box_PUBLICKEYBYTES + sizeof(uint64_t) + crypto_box_MACBYTES,
-                                      plain );
+    int len = decrypt_data_symmetric(shared_key,
+                                     packet + 1 + crypto_box_PUBLICKEYBYTES,
+                                     packet + 1 + crypto_box_PUBLICKEYBYTES + crypto_box_NONCEBYTES,
+                                     crypto_box_PUBLICKEYBYTES + sizeof(uint64_t) + crypto_box_MACBYTES,
+                                     plain);
 
     if (len != crypto_box_PUBLICKEYBYTES + sizeof(uint64_t)) {
         return 1;
@@ -1515,9 +1515,9 @@ int DHT_delfriend(DHT *dht, const uint8_t *public_key, uint16_t lock_count)
     --dht->num_friends;
 
     if (dht->num_friends != friend_num) {
-        memcpy( &dht->friends_list[friend_num],
-                &dht->friends_list[dht->num_friends],
-                sizeof(DHT_Friend) );
+        memcpy(&dht->friends_list[friend_num],
+               &dht->friends_list[dht->num_friends],
+               sizeof(DHT_Friend));
     }
 
     if (dht->num_friends == 0) {
@@ -1819,13 +1819,15 @@ static int friend_iplist(const DHT *dht, IP_Port *ip_portlist, uint16_t friend_n
 #ifdef FRIEND_IPLIST_PAD
     memcpy(ip_portlist, ipv6s, num_ipv6s * sizeof(IP_Port));
 
-    if (num_ipv6s == MAX_FRIEND_CLIENTS)
+    if (num_ipv6s == MAX_FRIEND_CLIENTS) {
         return MAX_FRIEND_CLIENTS;
+    }
 
     int num_ipv4s_used = MAX_FRIEND_CLIENTS - num_ipv6s;
 
-    if (num_ipv4s_used > num_ipv4s)
+    if (num_ipv4s_used > num_ipv4s) {
         num_ipv4s_used = num_ipv4s;
+    }
 
     memcpy(&ip_portlist[num_ipv6s], ipv4s, num_ipv4s_used * sizeof(IP_Port));
     return num_ipv6s + num_ipv4s_used;
@@ -2654,8 +2656,9 @@ void do_DHT(DHT *dht)
 #endif
 #ifdef ENABLE_ASSOC_DHT
 
-    if (dht->assoc)
+    if (dht->assoc) {
         do_Assoc(dht->assoc, dht);
+    }
 
 #endif
     dht->last_run = unix_time();
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index b72fac93..8f5432da 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -1892,7 +1892,7 @@ Messenger *new_messenger(Logger *log, Messenger_Options *options, unsigned int *
         *error = MESSENGER_ERROR_OTHER;
     }
 
-    if ( ! m ) {
+    if (! m) {
         return NULL;
     }
 
diff --git a/toxcore/TCP_server.c b/toxcore/TCP_server.c
index d4b5ddd1..0a347342 100644
--- a/toxcore/TCP_server.c
+++ b/toxcore/TCP_server.c
@@ -1184,8 +1184,9 @@ static void do_TCP_confirmed(TCP_Server *TCP_server)
 {
 #ifdef TCP_SERVER_USE_EPOLL
 
-    if (TCP_server->last_run_pinged == unix_time())
+    if (TCP_server->last_run_pinged == unix_time()) {
         return;
+    }
 
     TCP_server->last_run_pinged = unix_time();
 #endif
diff --git a/toxcore/network.c b/toxcore/network.c
index 1e6661cb..e42c962b 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -56,8 +56,9 @@ static const char *inet_ntop(sa_family_t family, void *addr, char *buf, size_t b
 
         DWORD len = bufsize;
 
-        if (WSAAddressToString((LPSOCKADDR)&saddr, sizeof(saddr), NULL, buf, &len))
+        if (WSAAddressToString((LPSOCKADDR)&saddr, sizeof(saddr), NULL, buf, &len)) {
             return NULL;
+        }
 
         return buf;
     } else if (family == AF_INET6) {
@@ -69,8 +70,9 @@ static const char *inet_ntop(sa_family_t family, void *addr, char *buf, size_t b
 
         DWORD len = bufsize;
 
-        if (WSAAddressToString((LPSOCKADDR)&saddr, sizeof(saddr), NULL, buf, &len))
+        if (WSAAddressToString((LPSOCKADDR)&saddr, sizeof(saddr), NULL, buf, &len)) {
             return NULL;
+        }
 
         return buf;
     }
@@ -86,8 +88,9 @@ static int inet_pton(sa_family_t family, const char *addrString, void *addrbuf)
 
         INT len = sizeof(saddr);
 
-        if (WSAStringToAddress((LPTSTR)addrString, AF_INET, NULL, (LPSOCKADDR)&saddr, &len))
+        if (WSAStringToAddress((LPTSTR)addrString, AF_INET, NULL, (LPSOCKADDR)&saddr, &len)) {
             return 0;
+        }
 
         *(struct in_addr *)addrbuf = saddr.sin_addr;
 
@@ -98,8 +101,9 @@ static int inet_pton(sa_family_t family, const char *addrString, void *addrbuf)
 
         INT len = sizeof(saddr);
 
-        if (WSAStringToAddress((LPTSTR)addrString, AF_INET6, NULL, (LPSOCKADDR)&saddr, &len))
+        if (WSAStringToAddress((LPTSTR)addrString, AF_INET6, NULL, (LPSOCKADDR)&saddr, &len)) {
             return 0;
+        }
 
         *(struct in6_addr *)addrbuf = saddr.sin6_addr;
 
@@ -480,8 +484,9 @@ int networking_at_startup(void)
 #if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
     WSADATA wsaData;
 
-    if (WSAStartup(MAKEWORD(2, 2), &wsaData) != NO_ERROR)
+    if (WSAStartup(MAKEWORD(2, 2), &wsaData) != NO_ERROR) {
         return -1;
+    }
 
 #endif
     srand((uint32_t)current_time_actual());
@@ -645,7 +650,7 @@ Networking_Core *new_networking_ex(Logger *log, IP ip, uint16_t port_from, uint1
     if (ip.family == AF_INET6) {
         int is_dualstack = set_socket_dualstack(temp->sock);
         LOGGER_DEBUG(log, "Dual-stack socket: %s",
-                     is_dualstack ? "enabled" : "Failed to enable, won't be able to receive from/send to IPv4 addresses" );
+                     is_dualstack ? "enabled" : "Failed to enable, won't be able to receive from/send to IPv4 addresses");
         /* multicast local nodes */
         struct ipv6_mreq mreq;
         memset(&mreq, 0, sizeof(mreq));
@@ -656,7 +661,7 @@ Networking_Core *new_networking_ex(Logger *log, IP ip, uint16_t port_from, uint1
         int res = setsockopt(temp->sock, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, (char *)&mreq, sizeof(mreq));
 
         LOGGER_DEBUG(log, res < 0 ? "Failed to activate local multicast membership. (%u, %s)" :
-                     "Local multicast group FF02::1 joined successfully", errno, strerror(errno) );
+                     "Local multicast group FF02::1 joined successfully", errno, strerror(errno));
     }
 
     /* a hanging program or a different user might block the standard port;
diff --git a/toxcore/onion_client.c b/toxcore/onion_client.c
index a140e008..0dca8525 100644
--- a/toxcore/onion_client.c
+++ b/toxcore/onion_client.c
@@ -642,7 +642,7 @@ static int client_ping_nodes(Onion_Client *onion_c, uint32_t num, const Node_for
         if (is_timeout(list_nodes[0].timestamp, ONION_NODE_TIMEOUT)
                 || id_closest(reference_id, list_nodes[0].public_key, nodes[i].public_key) == 2
                 || is_timeout(list_nodes[1].timestamp, ONION_NODE_TIMEOUT)
-                || id_closest(reference_id, list_nodes[1].public_key, nodes[i].public_key) == 2 ) {
+                || id_closest(reference_id, list_nodes[1].public_key, nodes[i].public_key) == 2) {
             /* check if node is already in list. */
             for (j = 0; j < list_length; ++j) {
                 if (public_key_cmp(list_nodes[j].public_key, nodes[i].public_key) == 0) {
diff --git a/toxcore/ping.c b/toxcore/ping.c
index d2a01f5d..d15ccd47 100644
--- a/toxcore/ping.c
+++ b/toxcore/ping.c
@@ -125,7 +125,7 @@ static int send_ping_response(PING *ping, IP_Port ipp, const uint8_t *public_key
     rc = encrypt_data_symmetric(shared_encryption_key,
                                 pk + 1 + crypto_box_PUBLICKEYBYTES,
                                 ping_plain, sizeof(ping_plain),
-                                pk + 1 + crypto_box_PUBLICKEYBYTES + crypto_box_NONCEBYTES );
+                                pk + 1 + crypto_box_PUBLICKEYBYTES + crypto_box_NONCEBYTES);
 
     if (rc != PING_PLAIN_SIZE + crypto_box_MACBYTES) {
         return 1;
@@ -158,7 +158,7 @@ static int handle_ping_request(void *_dht, IP_Port source, const uint8_t *packet
                                 packet + 1 + crypto_box_PUBLICKEYBYTES,
                                 packet + 1 + crypto_box_PUBLICKEYBYTES + crypto_box_NONCEBYTES,
                                 PING_PLAIN_SIZE + crypto_box_MACBYTES,
-                                ping_plain );
+                                ping_plain);
 
     if (rc != sizeof(ping_plain)) {
         return 1;
diff --git a/toxcore/util.c b/toxcore/util.c
index 40bf2849..f9fe7852 100644
--- a/toxcore/util.c
+++ b/toxcore/util.c
@@ -86,7 +86,7 @@ void host_to_net(uint8_t *num, uint16_t numbytes)
 uint16_t lendian_to_host16(uint16_t lendian)
 {
 #ifdef WORDS_BIGENDIAN
-    return  (lendian << 8) | (lendian >> 8 );
+    return (lendian << 8) | (lendian >> 8);
 #else
     return lendian;
 #endif
@@ -95,7 +95,7 @@ uint16_t lendian_to_host16(uint16_t lendian)
 void host_to_lendian32(uint8_t *dest,  uint32_t num)
 {
 #ifdef WORDS_BIGENDIAN
-    num = ((num << 8) & 0xFF00FF00 ) | ((num >> 8) & 0xFF00FF );
+    num = ((num << 8) & 0xFF00FF00) | ((num >> 8) & 0xFF00FF);
     num = (num << 16) | (num >> 16);
 #endif
     memcpy(dest, &num, sizeof(uint32_t));
@@ -106,7 +106,7 @@ void lendian_to_host32(uint32_t *dest, const uint8_t *lendian)
     uint32_t d;
     memcpy(&d, lendian, sizeof(uint32_t));
 #ifdef WORDS_BIGENDIAN
-    d = ((d << 8) & 0xFF00FF00 ) | ((d >> 8) & 0xFF00FF );
+    d = ((d << 8) & 0xFF00FF00) | ((d >> 8) & 0xFF00FF);
     d = (d << 16) | (d >> 16);
 #endif
     *dest = d;