kbe/calls
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sip: origin: Drop comparison that always evaluates as true

Browse Source 
This avoids the following warning:

../plugins/sip/calls-sip-origin.c: In function ‘sip_r_register’:
../plugins/sip/calls-sip-origin.c:483:26: warning: the comparison will always evaluate as ‘true’ for the address of ‘m_url’ will never be NULL [-Waddress]
  483 |     if (sip->sip_contact && sip->sip_contact->m_url && sip->sip_contact->m_url->url_host) {
      |                          ^~
In file included from /usr/include/sofia-sip-1.12/sofia-sip/nua.h:47,
                 from ../plugins/sip/calls-sip-util.h:28,
                 from ../plugins/sip/calls-sip-call.h:30,
                 from ../plugins/sip/calls-sip-origin.c:31:
/usr/include/sofia-sip-1.12/sofia-sip/sip.h:477:23: note: ‘m_url’ declared here
  477 |   url_t               m_url[1];     /**< SIP URL */
      |                       ^~~~~
../plugins/sip/calls-sip-origin.c: In function ‘sip_callback’:
../plugins/sip/calls-sip-origin.c:779:23: warning: the comparison will always evaluate as ‘true’ for the address of ‘a_url’ will never be NULL [-Waddress]
  779 |     if (sip->sip_from && sip->sip_from->a_url &&
      |                       ^~
/usr/include/sofia-sip-1.12/sofia-sip/sip.h:386:22: note: ‘a_url’ declared here
  386 |   url_t              a_url[1];      /**< URL */
      |                      ^~~~~
This commit is contained in:
Evangelos Ribeiro Tzaras
2022-07-27 16:05:43 +02:00
parent 76148fc4f1
commit 4188af73af
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/sip/calls-sip-origin.c
View File

@@ -480,7 +480,7 @@ sip_r_register (int status,
if (!origin->contact_header)
nua_get_params (nua, TAG_ANY (), TAG_END ());
if (sip->sip_contact && sip->sip_contact->m_url && sip->sip_contact->m_url->url_host) {
if (sip->sip_contact && sip->sip_contact->m_url->url_host) {
if (g_strcmp0 (origin->own_ip, sip->sip_contact->m_url->url_host) == 0)
return;
@@ -776,7 +776,7 @@ sip_callback (nua_event_t event,
switch (event) {
case nua_i_invite:
if (sip->sip_from && sip->sip_from->a_url &&
if (sip->sip_from &&
sip->sip_from->a_url->url_scheme &&
sip->sip_from->a_url->url_user &&
sip->sip_from->a_url->url_host)