Fix some clang warnings on Debian

This commit is contained in:
Gautier Pelloux-Prayer 2014-11-04 14:26:29 +01:00
parent f07b7be07a
commit cd2de42f86
3 changed files with 22 additions and 22 deletions

View file

@ -386,7 +386,7 @@ static void update_ip(LinphoneCall * call, int stats_type) {
if (local_desc != NULL) { if (local_desc != NULL) {
/*since this function might be called for video stream AFTER it has been uninitialized, local description might /*since this function might be called for video stream AFTER it has been uninitialized, local description might
be invalid. In any other case, IP/port should be always filled and valid*/ be invalid. In any other case, IP/port should be always filled and valid*/
if (local_desc->rtp_addr != NULL && strlen(local_desc->rtp_addr) > 0) { if (strlen(local_desc->rtp_addr) > 0) {
call->log->reporting.reports[stats_type]->info.local_addr.port = local_desc->rtp_port; call->log->reporting.reports[stats_type]->info.local_addr.port = local_desc->rtp_port;
STR_REASSIGN(call->log->reporting.reports[stats_type]->info.local_addr.ip, ms_strdup(local_desc->rtp_addr)); STR_REASSIGN(call->log->reporting.reports[stats_type]->info.local_addr.ip, ms_strdup(local_desc->rtp_addr));
} }
@ -397,7 +397,7 @@ static void update_ip(LinphoneCall * call, int stats_type) {
call->log->reporting.reports[stats_type]->info.remote_addr.port = remote_desc->rtp_port; call->log->reporting.reports[stats_type]->info.remote_addr.port = remote_desc->rtp_port;
/*for IP it can be not set if we are using a direct route*/ /*for IP it can be not set if we are using a direct route*/
if (remote_desc->rtp_addr != NULL && strlen(remote_desc->rtp_addr) > 0) { if (strlen(remote_desc->rtp_addr) > 0) {
STR_REASSIGN(call->log->reporting.reports[stats_type]->info.remote_addr.ip, ms_strdup(remote_desc->rtp_addr)); STR_REASSIGN(call->log->reporting.reports[stats_type]->info.remote_addr.ip, ms_strdup(remote_desc->rtp_addr));
} else { } else {
STR_REASSIGN(call->log->reporting.reports[stats_type]->info.remote_addr.ip, ms_strdup(sal_call_get_remote_media_description(call->op)->addr)); STR_REASSIGN(call->log->reporting.reports[stats_type]->info.remote_addr.ip, ms_strdup(sal_call_get_remote_media_description(call->op)->addr));

@ -1 +1 @@
Subproject commit f74295ef1a01ec50fa46aac5ab891527a33d8eb6 Subproject commit 30246c54f458c8bc2b93851b5c2e7aa7f16da8ce

View file

@ -2182,7 +2182,7 @@ static void early_media_call_with_ringing(void){
CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,1000)); CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,1000));
CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,1000)); CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,1000));
ended_time=time(NULL); ended_time=time(NULL);
CU_ASSERT_TRUE (abs (linphone_call_log_get_duration(marie_call_log) - (ended_time - connected_time)) <1 ); CU_ASSERT_TRUE (labs (linphone_call_log_get_duration(marie_call_log) - (ended_time - connected_time)) <1 );
ms_list_free(lcs); ms_list_free(lcs);
} }