diff options
author | iphydf <iphydf@users.noreply.github.com> | 2016-08-09 13:46:41 +0100 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2016-08-12 01:00:00 +0100 |
commit | 459f8f201393ac458445aebbd14c45bf4d6f5912 (patch) | |
tree | 67c7eb3c6338f701cdbd3fae808b45fa126fcd74 /other/bootstrap_daemon/src | |
parent | 8339e3449f41f5d6edd16a8657f7faa84040fdc3 (diff) |
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.
Diffstat (limited to 'other/bootstrap_daemon/src')
-rw-r--r-- | other/bootstrap_daemon/src/command_line_arguments.h | 3 | ||||
-rw-r--r-- | other/bootstrap_daemon/src/config.c | 5 | ||||
-rw-r--r-- | other/bootstrap_daemon/src/config.h | 6 |
3 files changed, 7 insertions, 7 deletions
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 @@ | |||
37 | * @param log_backend Sets to the provided by the user log backend option. | 37 | * @param log_backend Sets to the provided by the user log backend option. |
38 | * @param run_in_foreground Sets to the provided by the user foreground option. | 38 | * @param run_in_foreground Sets to the provided by the user foreground option. |
39 | */ | 39 | */ |
40 | void handle_command_line_arguments(int argc, char *argv[], char **cfg_file_path, LOG_BACKEND *log_backend, bool *run_in_foreground); | 40 | void handle_command_line_arguments(int argc, char *argv[], char **cfg_file_path, LOG_BACKEND *log_backend, |
41 | bool *run_in_foreground); | ||
41 | 42 | ||
42 | #endif // COMMAND_LINE_ARGUMENTS_H | 43 | #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 | |||
143 | } | 143 | } |
144 | 144 | ||
145 | int get_general_config(const char *cfg_file_path, char **pid_file_path, char **keys_file_path, int *port, | 145 | int get_general_config(const char *cfg_file_path, char **pid_file_path, char **keys_file_path, int *port, |
146 | int *enable_ipv6, | 146 | int *enable_ipv6, int *enable_ipv4_fallback, int *enable_lan_discovery, int *enable_tcp_relay, |
147 | int *enable_ipv4_fallback, int *enable_lan_discovery, int *enable_tcp_relay, uint16_t **tcp_relay_ports, | 147 | uint16_t **tcp_relay_ports, int *tcp_relay_port_count, int *enable_motd, char **motd) |
148 | int *tcp_relay_port_count, int *enable_motd, char **motd) | ||
149 | { | 148 | { |
150 | config_t cfg; | 149 | config_t cfg; |
151 | 150 | ||
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 @@ | |||
37 | * @return 1 on success, | 37 | * @return 1 on success, |
38 | * 0 on failure, doesn't modify any data pointed by arguments. | 38 | * 0 on failure, doesn't modify any data pointed by arguments. |
39 | */ | 39 | */ |
40 | int get_general_config(const char *cfg_file_path, char **pid_file_path, char **keys_file_path, int *port, int *enable_ipv6, | 40 | int get_general_config(const char *cfg_file_path, char **pid_file_path, char **keys_file_path, int *port, |
41 | int *enable_ipv4_fallback, int *enable_lan_discovery, int *enable_tcp_relay, uint16_t **tcp_relay_ports, | 41 | int *enable_ipv6, int *enable_ipv4_fallback, int *enable_lan_discovery, int *enable_tcp_relay, |
42 | int *tcp_relay_port_count, int *enable_motd, char **motd); | 42 | uint16_t **tcp_relay_ports, int *tcp_relay_port_count, int *enable_motd, char **motd); |
43 | 43 | ||
44 | /** | 44 | /** |
45 | * Bootstraps off nodes listed in the config file. | 45 | * Bootstraps off nodes listed in the config file. |