Move c_sleep to helpers.h and misc_tools.h

Also fix a mistake with forgotten braces around parameter
2024-03-22 13:30:51 +08:00 · 2017-03-03 21:30:11 +03:00 · 2017-03-03 21:30:11 +03:00 · 50c526e1a5
commit 50c526e1a5
parent a1f9df48d6
20 changed files with 23 additions and 123 deletions
--- a/auto_tests/TCP_test.c
+++ b/auto_tests/TCP_test.c
@ -18,13 +18,6 @@

 #include "helpers.h"

-#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
-#define c_sleep(x) Sleep(1*x)
-#else
-#include <unistd.h>
-#define c_sleep(x) usleep(1000*x)
-#endif
-
 #define NUM_PORTS 3

 static uint16_t ports[NUM_PORTS] = {1234, 33445, 25643};
--- a/auto_tests/conference_test.c
+++ b/auto_tests/conference_test.c
@ -17,15 +17,6 @@

 #include "helpers.h"

-#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
-#include <windows.h>
-#define c_sleep(x) Sleep(1*x)
-#else
-#include <unistd.h>
-#define c_sleep(x) usleep(1000*x)
-#endif
-
-
 #define NUM_GROUP_TOX 32

 static void g_accept_friend_request(Tox *m, const uint8_t *public_key, const uint8_t *data, size_t length,
--- a/auto_tests/dht_test.c
+++ b/auto_tests/dht_test.c
@ -571,14 +571,6 @@ static void ip_callback(void *data, int32_t number, IP_Port ip_port)
 {
 }

-
-#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
-#define c_sleep(x) Sleep(1*x)
-#else
-#include <unistd.h>
-#define c_sleep(x) usleep(1000*x)
-#endif
-
 #define NUM_DHT_FRIENDS 20

 START_TEST(test_DHT_test)
--- a/auto_tests/helpers.h
+++ b/auto_tests/helpers.h
@ -7,6 +7,14 @@
 #include <check.h>
 #include <stdio.h>

+#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
+#include <windows.h>
+#define c_sleep(x) Sleep(x)
+#else
+#include <unistd.h>
+#define c_sleep(x) usleep(1000*(x))
+#endif
+
 #define DEFTESTCASE(NAME)                   \
    TCase *tc_##NAME = tcase_create(#NAME); \
    tcase_add_test(tc_##NAME, test_##NAME); \
--- a/auto_tests/onion_test.c
+++ b/auto_tests/onion_test.c
@ -18,13 +18,6 @@

 #include "helpers.h"

-#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
-#define c_sleep(x) Sleep(1*x)
-#else
-#include <unistd.h>
-#define c_sleep(x) usleep(1000*x)
-#endif
-
 static void do_onion(Onion *onion)
 {
    networking_poll(onion->net, NULL);
--- a/auto_tests/save_friend_test.c
+++ b/auto_tests/save_friend_test.c
@ -12,14 +12,6 @@
 #include <stdlib.h>
 #include <string.h>

-#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
-#include <windows.h>
-#define c_sleep(x) Sleep(1*x)
-#else
-#include <unistd.h>
-#define c_sleep(x) usleep(1000*x)
-#endif
-
 struct test_data {
    uint8_t name[TOX_MAX_NAME_LENGTH];
    uint8_t status_message[TOX_MAX_STATUS_MESSAGE_LENGTH];
--- a/auto_tests/tox_many_tcp_test.c
+++ b/auto_tests/tox_many_tcp_test.c
@ -17,14 +17,6 @@

 #include "helpers.h"

-#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
-#include <windows.h>
-#define c_sleep(x) Sleep(1*x)
-#else
-#include <unistd.h>
-#define c_sleep(x) usleep(1000*x)
-#endif
-
 /* The Travis-CI container responds poorly to ::1 as a localhost address
 * You're encouraged to -D FORCE_TESTS_IPV6 on a local test  */
 #ifdef FORCE_TESTS_IPV6
--- a/auto_tests/tox_many_test.c
+++ b/auto_tests/tox_many_test.c
@ -17,14 +17,6 @@

 #include "helpers.h"

-#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
-#include <windows.h>
-#define c_sleep(x) Sleep(1*x)
-#else
-#include <unistd.h>
-#define c_sleep(x) usleep(1000*x)
-#endif
-
 static void accept_friend_request(Tox *m, const uint8_t *public_key, const uint8_t *data, size_t length, void *userdata)
 {
    if (*((uint32_t *)userdata) != 974536) {
--- a/auto_tests/tox_test.c
+++ b/auto_tests/tox_test.c
@ -27,14 +27,6 @@

 #include "helpers.h"

-#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
-#include <windows.h>
-#define c_sleep(x) Sleep(1*x)
-#else
-#include <unistd.h>
-#define c_sleep(x) usleep(1000*x)
-#endif
-
 /* The Travis-CI container responds poorly to ::1 as a localhost address
 * You're encouraged to -D FORCE_TESTS_IPV6 on a local test  */
 #ifdef FORCE_TESTS_IPV6
--- a/auto_tests/toxav_basic_test.c
+++ b/auto_tests/toxav_basic_test.c
@ -22,15 +22,6 @@
 #include "../toxcore/util.h"


-#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
-#include <windows.h>
-#define c_sleep(x) Sleep(1*x)
-#else
-#include <unistd.h>
-#define c_sleep(x) usleep(1000*x)
-#endif
-
-
 #define TEST_REGULAR_AV 1
 #define TEST_REGULAR_A 1
 #define TEST_REGULAR_V 1
--- a/auto_tests/toxav_many_test.c
+++ b/auto_tests/toxav_many_test.c
@ -21,16 +21,10 @@
 #include "../toxcore/tox.h"
 #include "../toxcore/util.h"

-#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
-#include <windows.h>
-#define c_sleep(x) Sleep(1*x)
-#else
+#if !defined(_WIN32) && !defined(__WIN32__) && !defined(WIN32)
 #include <pthread.h>
-#include <unistd.h>
-#define c_sleep(x) usleep(1000*x)
 #endif

-
 typedef struct {
    bool incoming;
    uint32_t state;
--- a/other/DHT_bootstrap.c
+++ b/other/DHT_bootstrap.c
@ -50,15 +50,6 @@
 #define DHT_MOTD "This is a test motd"
 #endif

-/* Sleep function (x = milliseconds) */
-#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
-#define c_sleep(x) Sleep(1*x)
-#else
-#include <arpa/inet.h>
-#include <unistd.h>
-#define c_sleep(x) usleep(1000*x)
-#endif
-
 #define PORT 33445


--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@ -41,16 +41,8 @@

 #include <string.h>

-//Sleep function (x = milliseconds)
-#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
-
-#define c_sleep(x) Sleep(1*x)
-
-#else
+#if !defined(_WIN32) && !defined(__WIN32__) && !defined (WIN32)
 #include <arpa/inet.h>
-#include <unistd.h>
-#define c_sleep(x) usleep(1000*x)
-
 #endif

 #define PORT 33445
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@ -47,15 +47,8 @@
 #include "../toxcore/Messenger.h"
 #include "misc_tools.c"

-#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
-
-#define c_sleep(x) Sleep(1*x)
-
-#else
+#if !defined(_WIN32) && !defined(__WIN32__) && !defined (WIN32)
 #include <arpa/inet.h>
-#include <unistd.h>
-#define c_sleep(x) usleep(1000*x)
-#define PORT 33445

 #endif

--- a/testing/av_test.c
+++ b/testing/av_test.c
@ -73,7 +73,7 @@ extern "C" {
 #include <time.h>
 #include <unistd.h>

-#define c_sleep(x) usleep(1000*x)
+#define c_sleep(x) usleep(1000*(x))


 #define CLIP(X) ((X) > 255 ? 255 : (X) < 0 ? 0 : X)
--- a/testing/dns3_test.c
+++ b/testing/dns3_test.c
@ -3,15 +3,6 @@
 #include "../toxdns/toxdns.h"
 #include "misc_tools.c"

-#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
-
-#define c_sleep(x) Sleep(1*x)
-
-#else
-#define c_sleep(x) usleep(1000*x)
-
-#endif
-
 static uint32_t create_packet(uint8_t *packet, uint8_t *string, uint8_t str_len, uint8_t id)
 {
    memset(packet, 0, str_len + 13 + 16);
--- a/testing/misc_tools.c
+++ b/testing/misc_tools.c
@ -31,6 +31,15 @@
 #include <stdlib.h>
 #include <string.h>

+//Sleep function (x = milliseconds)
+#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
+#include <windows.h>
+#define c_sleep(x) Sleep(x)
+#else
+#include <unistd.h>
+#define c_sleep(x) usleep(1000*(x))
+#endif
+
 // You are responsible for freeing the return value!
 uint8_t *hex_string_to_bin(const char *hex_string)
 {
--- a/testing/nTox.c
+++ b/testing/nTox.c
@ -48,10 +48,10 @@
 #include <time.h>

 #if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
-#define c_sleep(x) Sleep(1*x)
+#define c_sleep(x) Sleep(x)
 #else
 #include <unistd.h>
-#define c_sleep(x) usleep(1000*x)
+#define c_sleep(x) usleep(1000*(x))
 #endif

 static void new_lines(char const *line);
--- a/testing/tox_shell.c
+++ b/testing/tox_shell.c
@ -43,9 +43,6 @@
 #include <pty.h>
 #endif
 #include <fcntl.h>
-#include <unistd.h>
-
-#define c_sleep(x) usleep(1000*x)

 static void print_online(Tox *tox, uint32_t friendnumber, TOX_CONNECTION status, void *userdata)
 {
--- a/testing/tox_sync.c
+++ b/testing/tox_sync.c
@ -38,9 +38,6 @@
 #include "../toxcore/tox.h"
 #include "misc_tools.c"

-#include <unistd.h>
-#define c_sleep(x) usleep(1000*x)
-
 #include <arpa/inet.h>
 #include <dirent.h>
 #include <netinet/in.h>