From 188dd5f4dfa927b099144bf76fa4457e1938cf36 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Wed, 19 Jun 2019 02:05:08 +0700 Subject: [PATCH] tests/msc_vlr: fix: do not pass RAT type to expect_bssap_clear() The function name implies OSMO_RAT_GERAN_A, and it has nothing to do with other OSMO_RAT_* types. Found using clang: warning: too many arguments in call to 'expect_bssap_clear' expect_bssap_clear(OSMO_RAT_GERAN_A); ^^^^^^^^^^^^^^^^ Change-Id: Id3a3af33fcc5da4ca4c48a2f589a69f3568d2586 --- tests/msc_vlr/msc_vlr_test_gsm_authen.c | 6 +++--- tests/msc_vlr/msc_vlr_test_gsm_ciph.c | 10 +++++----- tests/msc_vlr/msc_vlr_test_no_authen.c | 4 ++-- tests/msc_vlr/msc_vlr_test_reject_concurrency.c | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c b/tests/msc_vlr/msc_vlr_test_gsm_authen.c index 8776e03ab..ee5af1ecb 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c @@ -113,7 +113,7 @@ static void test_gsm_authen() VERBOSE_ASSERT(cm_service_result_sent, == RES_ACCEPT, "%d"); /* Release connection */ - expect_bssap_clear(OSMO_RAT_GERAN_A); + expect_bssap_clear(); conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS); btw("all requests serviced, conn has been released"); @@ -327,7 +327,7 @@ static void test_gsm_authen_tmsi() VERBOSE_ASSERT(cm_service_result_sent, == RES_ACCEPT, "%d"); /* Release connection */ - expect_bssap_clear(OSMO_RAT_GERAN_A); + expect_bssap_clear(); conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS); btw("all requests serviced, conn has been released"); @@ -1017,7 +1017,7 @@ static void test_gsm_milenage_authen() VERBOSE_ASSERT(cm_service_result_sent, == RES_ACCEPT, "%d"); /* Release connection */ - expect_bssap_clear(OSMO_RAT_GERAN_A); + expect_bssap_clear(); conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS); btw("all requests serviced, conn has been released"); diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c index c76cba4ef..155afbe72 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c @@ -128,7 +128,7 @@ static void test_ciph() VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); /* Release connection */ - expect_bssap_clear(OSMO_RAT_GERAN_A); + expect_bssap_clear(); conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS); btw("all requests serviced, conn has been released"); @@ -363,7 +363,7 @@ static void test_ciph_tmsi() VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); /* Release connection */ - expect_bssap_clear(OSMO_RAT_GERAN_A); + expect_bssap_clear(); conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS); btw("all requests serviced, conn has been released"); @@ -967,7 +967,7 @@ static void test_gsm_ciph_in_umts_env() VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); /* Release connection */ - expect_bssap_clear(OSMO_RAT_GERAN_A); + expect_bssap_clear(); conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS); btw("all requests serviced, conn has been released"); @@ -1158,7 +1158,7 @@ static void test_a5_3_supported() VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); /* Release connection */ - expect_bssap_clear(OSMO_RAT_GERAN_A); + expect_bssap_clear(); conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS); btw("all requests serviced, conn has been released"); @@ -1375,7 +1375,7 @@ static void test_cm_service_needs_classmark_update() VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); /* Release connection */ - expect_bssap_clear(OSMO_RAT_GERAN_A); + expect_bssap_clear(); conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS); btw("all requests serviced, conn has been released"); diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c index ae77252e1..9d506d6e7 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.c +++ b/tests/msc_vlr/msc_vlr_test_no_authen.c @@ -69,7 +69,7 @@ static void test_no_authen() EXPECT_ACCEPTED(true); /* Release connection */ - expect_bssap_clear(OSMO_RAT_GERAN_A); + expect_bssap_clear(); conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS); btw("all requests serviced, conn has been released"); @@ -227,7 +227,7 @@ static void test_no_authen_tmsi() EXPECT_ACCEPTED(true); /* Release connection */ - expect_bssap_clear(OSMO_RAT_GERAN_A); + expect_bssap_clear(); conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS); btw("all requests serviced, conn has been released"); diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c index fe5346945..648313f4d 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c @@ -308,7 +308,7 @@ static void test_reject_paging_resp_during_cm() BTW("The original CM Service Request can conclude"); /* Release connection */ - expect_bssap_clear(OSMO_RAT_GERAN_A); + expect_bssap_clear(); conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS); btw("all requests serviced, conn has been released");