toxcore/util.h:

- moved cmdline_parsefor_ipv46() to testing/misc_tools.c

8 files changed, 35 insertions, 39 deletions

diff --git a/other/DHT_bootstrap.c b/other/DHT_bootstrap.c
index f2e792ac..f5fa9818 100644
--- a/other/DHT_bootstrap.c
+++ b/other/DHT_bootstrap.c
@@ -33,7 +33,6 @@
 #include "../toxcore/DHT.h"
 #include "../toxcore/friend_requests.h"
 #include "../testing/misc_tools.c"
-#include "../toxcore/util.h"
 
 /* Sleep function (x = milliseconds) */
 #ifdef WIN32
diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index 5451c467..ba8c2f23 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -34,7 +34,6 @@
 //#include "../core/network.h"
 #include "../toxcore/DHT.h"
 #include "../toxcore/friend_requests.h"
-#include "../toxcore/util.h"
 #include "misc_tools.c"
 
 #include <string.h>
diff --git a/testing/Lossless_UDP_testclient.c b/testing/Lossless_UDP_testclient.c
index e36ac6eb..7891ce64 100644
--- a/testing/Lossless_UDP_testclient.c
+++ b/testing/Lossless_UDP_testclient.c
@@ -34,7 +34,7 @@
 
 #include "../toxcore/network.h"
 #include "../toxcore/Lossless_UDP.h"
-#include "../toxcore/util.h"
+#include "misc_tools.c"
 
 #ifdef WIN32
 
diff --git a/testing/Lossless_UDP_testserver.c b/testing/Lossless_UDP_testserver.c
index 97c3eb46..0fd4edd9 100644
--- a/testing/Lossless_UDP_testserver.c
+++ b/testing/Lossless_UDP_testserver.c
@@ -34,7 +34,7 @@
 
 #include "../toxcore/network.h"
 #include "../toxcore/Lossless_UDP.h"
-#include "../toxcore/util.h"
+#include "misc_tools.c"
 
 //Sleep function (x = milliseconds)
 #ifdef WIN32
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index 93069226..14d9ca20 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -43,7 +43,6 @@
 
 #include "../toxcore/Messenger.h"
 #include "misc_tools.c"
-#include "../toxcore/util.h"
 
 #ifdef WIN32
 
diff --git a/testing/misc_tools.c b/testing/misc_tools.c
index c4dce1bb..824200d8 100644
--- a/testing/misc_tools.c
+++ b/testing/misc_tools.c
@@ -46,3 +46,36 @@ unsigned char *hex_string_to_bin(char hex_string[])
 
     return val;
 }
+
+
+int cmdline_parsefor_ipv46(int argc, char **argv, uint8_t *ipv6enabled)
+{
+    int argvoffset = 0, argi;
+    for(argi = 1; argi < argc; argi++)
+        if (!strncasecmp(argv[argi], "--ipv", 5)) {
+            if (argv[argi][5] && !argv[argi][6]) {
+                char c = argv[argi][5];
+                if (c == '4')
+                    *ipv6enabled = 0;
+                else if (c == '6')
+                    *ipv6enabled = 1;
+                else {
+                    printf("Invalid argument: %s. Try --ipv4 or --ipv6!\n", argv[argi]);
+                    return -1;
+                }
+            }
+            else {
+                printf("Invalid argument: %s. Try --ipv4 or --ipv6!\n", argv[argi]);
+                return -1;
+            }
+
+            if (argvoffset != argi - 1) {
+                printf("Argument must come first: %s.\n", argv[argi]);
+                return -1;
+            }
+
+            argvoffset++;
+        }
+
+    return argvoffset;
+};
diff --git a/toxcore/util.c b/toxcore/util.c
index 7b5ddc49..19d464d4 100644
--- a/toxcore/util.c
+++ b/toxcore/util.c
@@ -43,38 +43,6 @@ void id_cpy(uint8_t *dest, uint8_t *src)
     memcpy(dest, src, CLIENT_ID_SIZE);
 }
 
-int cmdline_parsefor_ipv46(int argc, char **argv, uint8_t *ipv6enabled)
-{
-    int argvoffset = 0, argi;
-    for(argi = 1; argi < argc; argi++)
-        if (!strncasecmp(argv[argi], "--ipv", 5)) {
-            if (argv[argi][5] && !argv[argi][6]) {
-                char c = argv[argi][5];
-                if (c == '4')
-                    *ipv6enabled = 0;
-                else if (c == '6')
-                    *ipv6enabled = 1;
-                else {
-                    printf("Invalid argument: %s. Try --ipv4 or --ipv6!\n", argv[argi]);
-                    return -1;
-                }
-            }
-            else {
-                printf("Invalid argument: %s. Try --ipv4 or --ipv6!\n", argv[argi]);
-                return -1;
-            }
-
-            if (argvoffset != argi - 1) {
-                printf("Argument must come first: %s.\n", argv[argi]);
-                return -1;
-            }
-
-            argvoffset++;
-        }
-
-    return argvoffset;
-};
-
 #ifdef LOGGING
 char logbuffer[512];
 static FILE *logfile = NULL;
diff --git a/toxcore/util.h b/toxcore/util.h
index e7be2d51..71be84ca 100644
--- a/toxcore/util.h
+++ b/toxcore/util.h
@@ -16,8 +16,6 @@ uint64_t random_64b();
 bool id_eq(uint8_t *dest, uint8_t *src);
 void id_cpy(uint8_t *dest, uint8_t *src);
 
-int cmdline_parsefor_ipv46(int argc, char **argv, uint8_t *ipv6enabled);
-
 #undef LOGGING
 /* #define LOGGING */
 #ifdef LOGGING