From 8d4d3437ec65fb17657ac60eede0a1bae3936d2f Mon Sep 17 00:00:00 2001 From: Claudiu Olteanu Date: Thu, 19 Sep 2013 13:09:18 +0000 Subject: [PATCH] Removing the bluetooth tests on W32 --- src/transport/Makefile.am | 5 ----- .../gnunet-helper-transport-bluetooth.c | 17 ++++++++++------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 9e257f068..71a54d83f 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -82,11 +82,6 @@ if MINGW BT_BIN = gnunet-helper-transport-bluetooth BT_PLUGIN_LA = libgnunet_plugin_transport_bluetooth.la BT_PLUGIN_TEST = test_plugin_bluetooth - BT_API_TEST = test_transport_api_bluetooth - BT_REL_TEST = test_transport_api_reliability_bluetooth - BT_UREL_TEST = test_transport_api_unreliability_bluetooth - BT_QUOTA_TEST = test_quota_compliance_bluetooth \ - test_quota_compliance_bluetooth_asymmetric endif endif diff --git a/src/transport/gnunet-helper-transport-bluetooth.c b/src/transport/gnunet-helper-transport-bluetooth.c index f07fd23aa..457b77cfe 100644 --- a/src/transport/gnunet-helper-transport-bluetooth.c +++ b/src/transport/gnunet-helper-transport-bluetooth.c @@ -82,7 +82,10 @@ UINT8 mac[MAC_ADDR_SIZE]; }; - // {31191E56-FA7E-4517-870E-71B86BBCC52F} + /** + * The UUID used for the SDP service. + * {31191E56-FA7E-4517-870E-71B86BBCC52F} + */ #define GNUNET_BLUETOOTH_SDP_UUID \ { \ 0x31, 0x19, 0x1E, 0x56, \ @@ -614,12 +617,12 @@ check_crc_buf_osdep (const unsigned char *buf, size_t len) print_last_error() { LPVOID lpMsgBuf = NULL; - FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, GetLastError(), 0, (LPTSTR) &lpMsgBuf, 0, NULL); - fprintf (stderr, "%s\n", (char *)lpMsgBuf) ; - //FIXME : it crashes - // if (lpMsgBuf) - // free (lpMsgBuf); + + if (FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, GetLastError(), 0, (LPTSTR) &lpMsgBuf, 0, NULL)) + fprintf (stderr, "%s\n", (char *)lpMsgBuf); + else + fprintf (stderr, "Failed to format the message for the last error! Error number : %d\n", GetLastError()); } /** -- 2.25.1