retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #1550 in FS/freeswitch from fix-sofia-warning to master 

* commit '9a0a594d07f1a3654fba130db882fafec274e79e':
  FS-11278 #resolve fix if clause does not guard compiler warning
This commit is contained in:
Mike Jerris 2018-07-26 20:39:28 +00:00
parent d5af929660 9a0a594d07
commit 2ecd4425be
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c
View File

@ -1600,7 +1600,7 @@ int nua_client_next_request(nua_client_request_t *cr, int invite)
for (; cr; cr = cr->cr_next) { for (; cr; cr = cr->cr_next) {
if (cr->cr_method == sip_method_cancel) if (cr->cr_method == sip_method_cancel)
continue; continue;
break; break;
} }
if (cr && !nua_client_request_in_progress(cr)) { if (cr && !nua_client_request_in_progress(cr)) {

9
libs/sofia-sip/libsofia-sip-ua/sdp/sdp.c
View File

@ -1858,7 +1858,9 @@ int sdp_rtpmap_match(sdp_rtpmap_t const *a, sdp_rtpmap_t const *b)
if (aparam == bparam) if (aparam == bparam)
return 1; return 1;
if (!aparam) aparam = "1"; if (!bparam) bparam = "1"; if (!aparam) aparam = "1";
if (!bparam) bparam = "1";
if (!su_casematch(aparam, bparam)) if (!su_casematch(aparam, bparam))
return 0; return 0;
@ -1895,7 +1897,10 @@ sdp_rtpmap_t *sdp_rtpmap_find_matching(sdp_rtpmap_t const *list,
break; break;
} }
if (!lparam) lparam = "1"; if (!rparam) rparam = "1"; if (!lparam) lparam = "1";
if (!rparam) rparam = "1";
if (!su_casematch(lparam, rparam)) if (!su_casematch(lparam, rparam))
continue; continue;

6
libs/sofia-sip/libsofia-sip-ua/su/su_socket_port.c
View File

@ -170,10 +170,12 @@ void su_socket_port_deinit(su_port_t *self)
self->sup_mbox_index = 0; self->sup_mbox_index = 0;
if (self->sup_mbox[0] && self->sup_mbox[0] != INVALID_SOCKET) if (self->sup_mbox[0] && self->sup_mbox[0] != INVALID_SOCKET)
su_close(self->sup_mbox[0]); self->sup_mbox[0] = INVALID_SOCKET; su_close(self->sup_mbox[0]);
self->sup_mbox[0] = INVALID_SOCKET;
#if HAVE_SOCKETPAIR #if HAVE_SOCKETPAIR
if (self->sup_mbox[1] && self->sup_mbox[1] != INVALID_SOCKET) if (self->sup_mbox[1] && self->sup_mbox[1] != INVALID_SOCKET)
su_close(self->sup_mbox[1]); self->sup_mbox[1] = INVALID_SOCKET; su_close(self->sup_mbox[1]);
self->sup_mbox[1] = INVALID_SOCKET;
#endif #endif
su_pthread_port_deinit(self); su_pthread_port_deinit(self);