X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Fblackbox%2Frun_blackbox_tests%2Ftest_cases_channel_set_accept_cb.c;h=fa345b31f5e1e8891332275e6dcc333b5471af20;hb=3febbb4;hp=77d2c9cfa32af2843890b757fcb715590cc0377a;hpb=dc68da94af8fca91748579c84ef5ed798db7efab;p=meshlink

diff --git a/test/blackbox/run_blackbox_tests/test_cases_channel_set_accept_cb.c b/test/blackbox/run_blackbox_tests/test_cases_channel_set_accept_cb.c
index 77d2c9cf..fa345b31 100644
--- a/test/blackbox/run_blackbox_tests/test_cases_channel_set_accept_cb.c
+++ b/test/blackbox/run_blackbox_tests/test_cases_channel_set_accept_cb.c
@@ -16,6 +16,11 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
+
+#ifdef NDEBUG
+#undef NDEBUG
+#endif
+
 #include "execute_tests.h"
 #include "../common/containers.h"
 #include "../common/test_step.h"
@@ -43,18 +48,15 @@ static bool channel_accept(meshlink_handle_t *mesh, meshlink_channel_t *channel,
 static bool channel_reject(meshlink_handle_t *mesh, meshlink_channel_t *channel, uint16_t port, const void *data, size_t len);
 
 static bool channel_acc;
-static bool channel_rej;
 static bool polled;
 static bool rejected;
 
 /* mutex for the common variable */
 static pthread_mutex_t accept_lock = PTHREAD_MUTEX_INITIALIZER;
-static pthread_mutex_t reject_lock = PTHREAD_MUTEX_INITIALIZER;
 static pthread_mutex_t poll_lock = PTHREAD_MUTEX_INITIALIZER;
 static pthread_mutex_t lock_receive = PTHREAD_MUTEX_INITIALIZER;
 
 static pthread_cond_t accept_cond = PTHREAD_COND_INITIALIZER;
-static pthread_cond_t reject_cond = PTHREAD_COND_INITIALIZER;
 static pthread_cond_t poll_cond = PTHREAD_COND_INITIALIZER;
 static pthread_cond_t receive_cond = PTHREAD_COND_INITIALIZER;
 
@@ -67,12 +69,16 @@ static black_box_state_t test_case_channel_set_accept_cb_02_state = {
 
 /* channel receive callback */
 static void channel_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *dat, size_t len) {
+	(void)mesh;
+	(void)channel;
+	(void)dat;
+
 	if(!len) {
 		if(!meshlink_errno) {
-			pthread_mutex_lock(& lock_receive);
+			pthread_mutex_lock(&lock_receive);
 			rejected = true;
 			assert(!pthread_cond_broadcast(&receive_cond));
-			pthread_mutex_unlock(& lock_receive);
+			pthread_mutex_unlock(&lock_receive);
 		}
 	}
 }
@@ -88,9 +94,11 @@ static bool channel_reject(meshlink_handle_t *mesh, meshlink_channel_t *channel,
 }
 
 static bool channel_accept(meshlink_handle_t *mesh, meshlink_channel_t *channel, uint16_t port, const void *dat, size_t len) {
+	(void)mesh;
+	(void)channel;
 	(void)dat;
 	(void)len;
-	char *data = (char *) dat;
+
 	assert_int_equal(port, PORT);
 
 	pthread_mutex_lock(&accept_lock);
@@ -130,8 +138,8 @@ static void test_case_set_channel_accept_cb_01(void **state) {
 static bool test_steps_set_channel_accept_cb_01(void) {
 	/* deleting the confbase if already exists */
 	struct timespec timeout = {0};
-	meshlink_destroy("acceptconf1");
-	meshlink_destroy("acceptconf2");
+	assert(meshlink_destroy("acceptconf1"));
+	assert(meshlink_destroy("acceptconf2"));
 	meshlink_set_log_cb(NULL, TEST_MESHLINK_LOG_LEVEL, meshlink_callback_logger);
 
 	/* Create meshlink instances */
@@ -217,8 +225,8 @@ static bool test_steps_set_channel_accept_cb_01(void) {
 	/* closing channel, meshes and destroying confbase */
 	meshlink_close(mesh1);
 	meshlink_close(mesh2);
-	meshlink_destroy("acceptconf1");
-	meshlink_destroy("acceptconf2");
+	assert(meshlink_destroy("acceptconf1"));
+	assert(meshlink_destroy("acceptconf2"));
 
 	return true;
 }