Check code formatting on Travis.

We run astyle on Travis and check if there is a diff. The build terminates if
git finds a difference.

11 files changed, 41 insertions, 30 deletions

diff --git a/.travis.yml b/.travis.yml
index 2ced7f3c..2b099bae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ compiler:
 
 env:
   matrix:
-    - BUILD=hstox
+#    - BUILD=hstox
     - BUILD=toxcore
 
 addons:
diff --git a/auto_tests/tox_test.c b/auto_tests/tox_test.c
index f57a2611..397c8acd 100644
--- a/auto_tests/tox_test.c
+++ b/auto_tests/tox_test.c
@@ -944,7 +944,8 @@ START_TEST(test_many_clients_tcp)
         uint8_t dpk[TOX_PUBLIC_KEY_SIZE];
         tox_self_get_dht_id(toxes[0], dpk);
         TOX_ERR_BOOTSTRAP error = 0;
-        ck_assert_msg(tox_add_tcp_relay(toxes[i], TOX_LOCALHOST, TCP_RELAY_PORT, dpk, &error), "add relay error, %i, %i", i, error);
+        ck_assert_msg(tox_add_tcp_relay(toxes[i], TOX_LOCALHOST, TCP_RELAY_PORT, dpk, &error), "add relay error, %i, %i", i,
+                      error);
         ck_assert_msg(tox_bootstrap(toxes[i], TOX_LOCALHOST, 33445, dpk, 0), "Bootstrap error");
     }
 
@@ -1039,7 +1040,8 @@ START_TEST(test_many_clients_tcp_b)
         tox_callback_friend_request(toxes[i], accept_friend_request, &to_comp);
         uint8_t dpk[TOX_PUBLIC_KEY_SIZE];
         tox_self_get_dht_id(toxes[(i % NUM_TCP_RELAYS)], dpk);
-        ck_assert_msg(tox_add_tcp_relay(toxes[i], TOX_LOCALHOST, TCP_RELAY_PORT + (i % NUM_TCP_RELAYS), dpk, 0), "add relay error");
+        ck_assert_msg(tox_add_tcp_relay(toxes[i], TOX_LOCALHOST, TCP_RELAY_PORT + (i % NUM_TCP_RELAYS), dpk, 0),
+                      "add relay error");
         tox_self_get_dht_id(toxes[0], dpk);
         ck_assert_msg(tox_bootstrap(toxes[i], TOX_LOCALHOST, 33445, dpk, 0), "Bootstrap error");
     }
@@ -1169,7 +1171,7 @@ START_TEST(test_many_group)
     uint32_t to_comp = 234212;
     int test_run = 0;
 
-    group_test_restart:
+group_test_restart:
 
     for (i = 0; i < NUM_GROUP_TOX; ++i) {
         toxes[i] = tox_new(0, 0);
@@ -1264,8 +1266,8 @@ START_TEST(test_many_group)
          * important again.
          */
         ck_assert_msg(num_peers == NUM_GROUP_TOX, "\n\tBad number of group peers (pre check)."
-                                                  "\n\t\t\tExpected: %u but tox_instance(%u)  only has: %i\n\n",
-                                                   NUM_GROUP_TOX, i, num_peers);
+                      "\n\t\t\tExpected: %u but tox_instance(%u)  only has: %i\n\n",
+                      NUM_GROUP_TOX, i, num_peers);
 
         uint8_t title[2048];
         int ret = tox_group_get_title(toxes[i], 0, title, sizeof(title));
@@ -1308,8 +1310,8 @@ START_TEST(test_many_group)
         for (i = 0; i < (k - 1); ++i) {
             int num_peers = tox_group_number_peers(toxes[i], 0);
             ck_assert_msg(num_peers == (k - 1), "\n\tBad number of group peers (post check)."
-                                                "\n\t\t\tExpected: %u but tox_instance(%u)  only has: %i\n\n",
-                                                 (k - 1), i, num_peers);
+                          "\n\t\t\tExpected: %u but tox_instance(%u)  only has: %i\n\n",
+                          (k - 1), i, num_peers);
         }
     }
 
diff --git a/other/bootstrap_daemon/src/command_line_arguments.h b/other/bootstrap_daemon/src/command_line_arguments.h
index c73cd15e..1d30f428 100644
--- a/other/bootstrap_daemon/src/command_line_arguments.h
+++ b/other/bootstrap_daemon/src/command_line_arguments.h
@@ -37,6 +37,7 @@
  * @param log_backend Sets to the provided by the user log backend option.
  * @param run_in_foreground Sets to the provided by the user foreground option.
  */
-void handle_command_line_arguments(int argc, char *argv[], char **cfg_file_path, LOG_BACKEND *log_backend, bool *run_in_foreground);
+void handle_command_line_arguments(int argc, char *argv[], char **cfg_file_path, LOG_BACKEND *log_backend,
+                                   bool *run_in_foreground);
 
 #endif // COMMAND_LINE_ARGUMENTS_H
diff --git a/other/bootstrap_daemon/src/config.c b/other/bootstrap_daemon/src/config.c
index 12ae693d..29924ae4 100644
--- a/other/bootstrap_daemon/src/config.c
+++ b/other/bootstrap_daemon/src/config.c
@@ -143,9 +143,8 @@ void parse_tcp_relay_ports_config(config_t *cfg, uint16_t **tcp_relay_ports, int
 }
 
 int get_general_config(const char *cfg_file_path, char **pid_file_path, char **keys_file_path, int *port,
-                       int *enable_ipv6,
-                       int *enable_ipv4_fallback, int *enable_lan_discovery, int *enable_tcp_relay, uint16_t **tcp_relay_ports,
-                       int *tcp_relay_port_count, int *enable_motd, char **motd)
+                       int *enable_ipv6, int *enable_ipv4_fallback, int *enable_lan_discovery, int *enable_tcp_relay,
+                       uint16_t **tcp_relay_ports, int *tcp_relay_port_count, int *enable_motd, char **motd)
 {
     config_t cfg;
 
diff --git a/other/bootstrap_daemon/src/config.h b/other/bootstrap_daemon/src/config.h
index 13cf929a..93e7fc49 100644
--- a/other/bootstrap_daemon/src/config.h
+++ b/other/bootstrap_daemon/src/config.h
@@ -37,9 +37,9 @@
  * @return 1 on success,
  *         0 on failure, doesn't modify any data pointed by arguments.
  */
-int get_general_config(const char *cfg_file_path, char **pid_file_path, char **keys_file_path, int *port, int *enable_ipv6,
-                       int *enable_ipv4_fallback, int *enable_lan_discovery, int *enable_tcp_relay, uint16_t **tcp_relay_ports,
-                       int *tcp_relay_port_count, int *enable_motd, char **motd);
+int get_general_config(const char *cfg_file_path, char **pid_file_path, char **keys_file_path, int *port,
+                       int *enable_ipv6, int *enable_ipv4_fallback, int *enable_lan_discovery, int *enable_tcp_relay,
+                       uint16_t **tcp_relay_ports, int *tcp_relay_port_count, int *enable_motd, char **motd);
 
 /**
  * Bootstraps off nodes listed in the config file.
diff --git a/other/fun/strkey.c b/other/fun/strkey.c
index 7e5a1e1c..649b26dd 100644
--- a/other/fun/strkey.c
+++ b/other/fun/strkey.c
@@ -46,6 +46,7 @@
 void print_key(unsigned char *key)
 {
     size_t i;
+
     for (i = 0; i < crypto_box_PUBLICKEYBYTES; i++) {
         if (key[i] < 16) {
             fprintf(stdout, "0");
@@ -67,11 +68,14 @@ int main(int argc, char *argv[])
         offset = atoi(argv[1]);
         char *desired_hex = argv[2];
         len = strlen(desired_hex);
+
         if (len % 2 != 0) {
             fprintf(stderr, "Desired key should have an even number of letters\n");
             exit(1);
         }
-        size_t block_length = (offset < 0 ? 0 : offset) + len/2;
+
+        size_t block_length = (offset < 0 ? 0 : offset) + len / 2;
+
         if (block_length > crypto_box_PUBLICKEYBYTES) {
             fprintf(stderr, "The given key with the given offset exceed public key's length\n");
             exit(1);
@@ -80,6 +84,7 @@ int main(int argc, char *argv[])
         // convert hex to bin
         char *pos = desired_hex;
         size_t i;
+
         for (i = 0; i < len; pos += 2) {
             sscanf(pos, "%2hhx", &desired_bin[i]);
             ++i;
@@ -97,12 +102,14 @@ int main(int argc, char *argv[])
 
     if (offset < 0) {
         int found = 0;
+
         do {
 #ifdef PRINT_TRIES_COUNT
             tries ++;
 #endif
             crypto_box_keypair(public_key, secret_key);
             int i;
+
             for (i = 0; i <= crypto_box_PUBLICKEYBYTES - len; i ++) {
                 if (memcmp(public_key + i, desired_bin, len) == 0) {
                     found = 1;
@@ -115,7 +122,7 @@ int main(int argc, char *argv[])
 
         do {
 #ifdef PRINT_TRIES_COUNT
-            tries ++;
+            tries ++;
 #endif
             crypto_box_keypair(public_key, secret_key);
         } while (memcmp(p, desired_bin, len) != 0);
@@ -130,7 +137,7 @@ int main(int argc, char *argv[])
     fprintf(stdout, "\n");
 
 #ifdef PRINT_TRIES_COUNT
-        fprintf(stdout, "Found the key pair on %llu try.\n", tries);
+    fprintf(stdout, "Found the key pair on %llu try.\n", tries);
 #endif
 
     return 0;
diff --git a/other/travis/toxcore-script b/other/travis/toxcore-script
index b2ee5d02..b99bbe5b 100755
--- a/other/travis/toxcore-script
+++ b/other/travis/toxcore-script
@@ -3,8 +3,10 @@
 set -e -x
 
 # Check if toxcore.h and toxav.h match apidsl tox.in.h and toxav.in.h.
-../apidsl/_build/apigen.native ./other/apidsl/tox.in.h   | $ASTYLE --options=./other/astyle/astylerc > toxcore/tox.h
-../apidsl/_build/apigen.native ./other/apidsl/toxav.in.h | $ASTYLE --options=./other/astyle/astylerc > toxav/toxav.h
+../apidsl/_build/apigen.native other/apidsl/tox.in.h   | $ASTYLE --options=other/astyle/astylerc > toxcore/tox.h
+../apidsl/_build/apigen.native other/apidsl/toxav.in.h | $ASTYLE --options=other/astyle/astylerc > toxav/toxav.h
+# Check if the code is formatted according to the astyle configuration.
+$ASTYLE --options=other/astyle/astylerc `find . -name "*.[ch]" -and -not -name "*.in.*" -and -not -wholename "*crypto_pwhash*" -and -not -wholename "./super_donators/*"`
 git diff --exit-code
 
 # Build toxcore and run tests.
diff --git a/toxav/toxav.c b/toxav/toxav.c
index 814c4f26..1aece0b3 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -121,11 +121,11 @@ uint32_t toxav_version_patch(void)
 
 bool toxav_version_is_compatible(uint32_t major, uint32_t minor, uint32_t patch)
 {
-  return (TOXAV_VERSION_MAJOR == major && /* Force the major version */
+    return (TOXAV_VERSION_MAJOR == major && /* Force the major version */
             (TOXAV_VERSION_MINOR > minor || /* Current minor version must be newer than requested  -- or -- */
-                (TOXAV_VERSION_MINOR == minor && TOXAV_VERSION_PATCH >= patch) /* the patch must be the same or newer */
+             (TOXAV_VERSION_MINOR == minor && TOXAV_VERSION_PATCH >= patch) /* the patch must be the same or newer */
             )
-         );
+           );
 }
 
 ToxAV *toxav_new(Tox *tox, TOXAV_ERR_NEW *error)
diff --git a/toxcore/tox.c b/toxcore/tox.c
index 23d0d3e4..b642db75 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -87,11 +87,11 @@ uint32_t tox_version_patch(void)
 
 bool tox_version_is_compatible(uint32_t major, uint32_t minor, uint32_t patch)
 {
-  return (TOX_VERSION_MAJOR == major && /* Force the major version */
+    return (TOX_VERSION_MAJOR == major && /* Force the major version */
             (TOX_VERSION_MINOR > minor || /* Current minor version must be newer than requested -- or -- */
-                (TOX_VERSION_MINOR == minor && TOX_VERSION_PATCH >= patch) /* the patch must be the same or newer */
+             (TOX_VERSION_MINOR == minor && TOX_VERSION_PATCH >= patch) /* the patch must be the same or newer */
             )
-         );
+           );
 }
 
 
diff --git a/toxdns/toxdns.c b/toxdns/toxdns.c
index 1fbf4a00..a435eee5 100644
--- a/toxdns/toxdns.c
+++ b/toxdns/toxdns.c
@@ -43,7 +43,7 @@ uint8_t i = 0; \
             i++; \
         } \
     } \
-} \
+}
 
 typedef struct {
     uint8_t temp_pk[crypto_box_PUBLICKEYBYTES];
diff --git a/toxencryptsave/toxencryptsave.c b/toxencryptsave/toxencryptsave.c
index bbe0422f..267bd813 100644
--- a/toxencryptsave/toxencryptsave.c
+++ b/toxencryptsave/toxencryptsave.c
@@ -64,11 +64,11 @@ uint32_t toxes_version_patch(void)
 
 bool toxes_version_is_compatible(uint32_t major, uint32_t minor, uint32_t patch)
 {
-  return (TOXES_VERSION_MAJOR == major && /* Force the major version */
+    return (TOXES_VERSION_MAJOR == major && /* Force the major version */
             (TOXES_VERSION_MINOR > minor || /* Current minor version must be newer than requested  -- or -- */
-                (TOXES_VERSION_MINOR == minor && TOXES_VERSION_PATCH >= patch) /* the patch must be the same or newer */
+             (TOXES_VERSION_MINOR == minor && TOXES_VERSION_PATCH >= patch) /* the patch must be the same or newer */
             )
-         );
+           );
 }
 
 /* Clients should consider alerting their users that, unlike plain data, if even one bit