From 3aed512e65f0e1dca3d960a73b6348a505f0986e Mon Sep 17 00:00:00 2001 From: buildbot Date: Fri, 29 Jan 2016 08:55:51 +0100 Subject: [PATCH] fix gcc compilation issue --- tester/eventapi_tester.c | 3 +-- tester/presence_tester.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tester/eventapi_tester.c b/tester/eventapi_tester.c index 82f7d8f76..ce7c60c31 100644 --- a/tester/eventapi_tester.c +++ b/tester/eventapi_tester.c @@ -24,7 +24,6 @@ #include #include "liblinphone_tester.h" - static const char *subscribe_content="blabla"; static const char *notify_content="blabla"; @@ -40,7 +39,7 @@ void linphone_notify_received(LinphoneCore *lc, LinphoneEvent *lev, const char * LinphoneCoreManager *mgr; const char * ua = linphone_event_get_custom_header(lev, "User-Agent"); BC_ASSERT_PTR_NOT_NULL_FATAL(content); - if (!linphone_content_is_multipart(content) && (!ua || !strcasestr(ua, "flexisip"))) { /*disable check for full presence serveur support*/ + if (!linphone_content_is_multipart(content) && (!ua || !strstr(ua, "flexisip"))) { /*disable check for full presence serveur support*/ /*hack to disable content checking for list notify */ BC_ASSERT_STRING_EQUAL(notify_content,(const char*)linphone_content_get_buffer(content)); } diff --git a/tester/presence_tester.c b/tester/presence_tester.c index a1e7e06ff..77815e847 100644 --- a/tester/presence_tester.c +++ b/tester/presence_tester.c @@ -486,12 +486,15 @@ static void test_subscribe_notify_publish(void) { LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc"); LinphoneProxyConfig* proxy; LinphonePresenceModel* presence; + LpConfig *pauline_lp; + char* lf_identity; + LinphoneFriend *lf; linphone_core_set_user_agent(marie->lc, "full-presence-support", NULL); linphone_core_set_user_agent(pauline->lc, "full-presence-support", NULL); - LpConfig *pauline_lp = linphone_core_get_config(pauline->lc); - char* lf_identity=linphone_address_as_string_uri_only(marie->identity); - LinphoneFriend *lf = linphone_core_create_friend_with_address(pauline->lc,lf_identity); + pauline_lp = linphone_core_get_config(pauline->lc); + lf_identity=linphone_address_as_string_uri_only(marie->identity); + lf = linphone_core_create_friend_with_address(pauline->lc,lf_identity); lp_config_set_int(pauline_lp,"sip","subscribe_expires",5); @@ -744,7 +747,7 @@ static void test_presence_list(void) { linphone_core_manager_destroy(marie); linphone_core_manager_destroy(pauline); } - +#if 0 static void test_presence_list_subscribe_before_publish(void) { LinphoneCoreManager *laure = linphone_core_manager_new("laure_tcp_rc"); LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_rc"); @@ -794,7 +797,7 @@ static void test_presence_list_subscribe_before_publish(void) { linphone_core_manager_destroy(laure); linphone_core_manager_destroy(pauline); } - +#endif static void test_presence_list_subscription_expire_for_unknown(void) { LinphoneCoreManager *laure = linphone_core_manager_new("laure_tcp_rc"); const char *rls_uri = "sip:rls@sip.example.org";