[sr-dev] git:master:1d53ef3b: modules/ims_qos, modules/ims_registrar_scscf, modules/ims_auth: Warning logical-op-parentheses

Module: kamailio Branch: master Commit: 1d53ef3b4756cdd0692c9867f56e0c3f2d8535dd URL: https://github.com/kamailio/kamailio/commit/1d53ef3b4756cdd0692c9867f56e0c3… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-06-07T08:42:15+02:00 modules/ims_qos,modules/ims_registrar_scscf,modules/ims_auth: Warning logical-op-parentheses --- Modified: modules/ims_auth/pvt_message.c Modified: modules/ims_qos/mod.c Modified: modules/ims_registrar_scscf/pvt_message.c --- Diff: https://github.com/kamailio/kamailio/commit/1d53ef3b4756cdd0692c9867f56e0c3… Patch: https://github.com/kamailio/kamailio/commit/1d53ef3b4756cdd0692c9867f56e0c3… --- diff --git a/modules/ims_auth/pvt_message.c b/modules/ims_auth/pvt_message.c index ba8a53b..3b8274e 100644 --- a/modules/ims_auth/pvt_message.c +++ b/modules/ims_auth/pvt_message.c @@ -84,7 +84,7 @@ struct sip_msg* get_request_from_tx(struct cell *t) { (which we cannot assume) then we would pollute the shm_msg t->uas.request if we did any parsing on it. Instead, we need to make a private copy of the message and free it when we are done */ - if (_pv_treq.T != t || t->uas.request != _pv_treq.tmsgp + if ((_pv_treq.T != t || t->uas.request != _pv_treq.tmsgp) && t->uas.request->id != _pv_treq.id) { /* make a copy */ diff --git a/modules/ims_qos/mod.c b/modules/ims_qos/mod.c index af9ed91..b0ec900 100644 --- a/modules/ims_qos/mod.c +++ b/modules/ims_qos/mod.c @@ -683,7 +683,7 @@ static int w_rx_aar(struct sip_msg *msg, char *route, char* dir, char *c_id, int (which we cannot assume) then we would pollute the shm_msg t->uas.request if we did any parsing on it. Instead, we need to make a private copy of the message and free it when we are done */ - if (_pv_treq.T != t || t->uas.request != _pv_treq.tmsgp + if ((_pv_treq.T != t || t->uas.request != _pv_treq.tmsgp) && t->uas.request->id != _pv_treq.id) { /* make a copy */ diff --git a/modules/ims_registrar_scscf/pvt_message.c b/modules/ims_registrar_scscf/pvt_message.c index ba8a53b..3b8274e 100644 --- a/modules/ims_registrar_scscf/pvt_message.c +++ b/modules/ims_registrar_scscf/pvt_message.c @@ -84,7 +84,7 @@ struct sip_msg* get_request_from_tx(struct cell *t) { (which we cannot assume) then we would pollute the shm_msg t->uas.request if we did any parsing on it. Instead, we need to make a private copy of the message and free it when we are done */ - if (_pv_treq.T != t || t->uas.request != _pv_treq.tmsgp + if ((_pv_treq.T != t || t->uas.request != _pv_treq.tmsgp) && t->uas.request->id != _pv_treq.id) { /* make a copy */