summaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
authoriphydf <iphydf@users.noreply.github.com>2018-10-09 01:00:19 +0000
committeriphydf <iphydf@users.noreply.github.com>2018-10-16 22:11:53 +0000
commit700accb3c78eb919d9c05eacad12cf3cbdb1a8a5 (patch)
tree4359ec7abf4b730d04fedb2d4f8956e1b3d3bcb1 /testing
parented9beef61c5713db6083a165f3c7d56d7f06186e (diff)
Use `bool` for IPv6 flag in test programs and `DHT_bootstrap`.
Diffstat (limited to 'testing')
-rw-r--r--testing/DHT_test.c2
-rw-r--r--testing/Messenger_test.c2
-rw-r--r--testing/misc_tools.c6
-rw-r--r--testing/misc_tools.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index c2d6fe66..7e9a4a5f 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -177,7 +177,7 @@ int main(int argc, char *argv[])
177 } 177 }
178 178
179 /* let user override default by cmdline */ 179 /* let user override default by cmdline */
180 uint8_t ipv6enabled = TOX_ENABLE_IPV6_DEFAULT; /* x */ 180 bool ipv6enabled = TOX_ENABLE_IPV6_DEFAULT; /* x */
181 int argvoffset = cmdline_parsefor_ipv46(argc, argv, &ipv6enabled); 181 int argvoffset = cmdline_parsefor_ipv46(argc, argv, &ipv6enabled);
182 182
183 if (argvoffset < 0) { 183 if (argvoffset < 0) {
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index 70ee6578..5abb3998 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -92,7 +92,7 @@ static void print_request(Messenger *m2, const uint8_t *public_key, const uint8_
92int main(int argc, char *argv[]) 92int main(int argc, char *argv[])
93{ 93{
94 /* let user override default by cmdline */ 94 /* let user override default by cmdline */
95 uint8_t ipv6enabled = TOX_ENABLE_IPV6_DEFAULT; /* x */ 95 bool ipv6enabled = TOX_ENABLE_IPV6_DEFAULT; /* x */
96 int argvoffset = cmdline_parsefor_ipv46(argc, argv, &ipv6enabled); 96 int argvoffset = cmdline_parsefor_ipv46(argc, argv, &ipv6enabled);
97 97
98 if (argvoffset < 0) { 98 if (argvoffset < 0) {
diff --git a/testing/misc_tools.c b/testing/misc_tools.c
index 8991a222..22fa0d0c 100644
--- a/testing/misc_tools.c
+++ b/testing/misc_tools.c
@@ -121,7 +121,7 @@ int tox_strncasecmp(const char *s1, const char *s2, size_t n)
121 return 0; 121 return 0;
122} 122}
123 123
124int cmdline_parsefor_ipv46(int argc, char **argv, uint8_t *ipv6enabled) 124int cmdline_parsefor_ipv46(int argc, char **argv, bool *ipv6enabled)
125{ 125{
126 int argvoffset = 0, argi; 126 int argvoffset = 0, argi;
127 127
@@ -131,9 +131,9 @@ int cmdline_parsefor_ipv46(int argc, char **argv, uint8_t *ipv6enabled)
131 char c = argv[argi][5]; 131 char c = argv[argi][5];
132 132
133 if (c == '4') { 133 if (c == '4') {
134 *ipv6enabled = 0; 134 *ipv6enabled = false;
135 } else if (c == '6') { 135 } else if (c == '6') {
136 *ipv6enabled = 1; 136 *ipv6enabled = true;
137 } else { 137 } else {
138 printf("Invalid argument: %s. Try --ipv4 or --ipv6!\n", argv[argi]); 138 printf("Invalid argument: %s. Try --ipv4 or --ipv6!\n", argv[argi]);
139 return -1; 139 return -1;
diff --git a/testing/misc_tools.h b/testing/misc_tools.h
index e7060551..b9c3ca3e 100644
--- a/testing/misc_tools.h
+++ b/testing/misc_tools.h
@@ -15,7 +15,7 @@ void c_sleep(uint32_t x);
15uint8_t *hex_string_to_bin(const char *hex_string); 15uint8_t *hex_string_to_bin(const char *hex_string);
16void to_hex(char *out, uint8_t *in, int size); 16void to_hex(char *out, uint8_t *in, int size);
17int tox_strncasecmp(const char *s1, const char *s2, size_t n); 17int tox_strncasecmp(const char *s1, const char *s2, size_t n);
18int cmdline_parsefor_ipv46(int argc, char **argv, uint8_t *ipv6enabled); 18int cmdline_parsefor_ipv46(int argc, char **argv, bool *ipv6enabled);
19 19
20void print_debug_log(Tox *m, Tox_Log_Level level, const char *file, uint32_t line, const char *func, 20void print_debug_log(Tox *m, Tox_Log_Level level, const char *file, uint32_t line, const char *func,
21 const char *message, void *user_data); 21 const char *message, void *user_data);