[sr-dev] git:master:c49d6cb4: Merge pull request #637 from mslehto/ims-warning

Module: kamailio Branch: master Commit: c49d6cb41ace240a8e83fd116d3259f75163692a URL: https://github.com/kamailio/kamailio/commit/c49d6cb41ace240a8e83fd116d3259f… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: 2016-06-03T09:25:43+02:00 Merge pull request #637 from mslehto/ims-warning Fix or silence warnings given by Clang --- Modified: lib/ims/ims_getters.c Modified: modules/ims_auth/utils.c Modified: modules/ims_dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/c49d6cb41ace240a8e83fd116d3259f… Patch: https://github.com/kamailio/kamailio/commit/c49d6cb41ace240a8e83fd116d3259f… --- diff --git a/lib/ims/ims_getters.c b/lib/ims/ims_getters.c index 5765ba9..74e8180 100644 --- a/lib/ims/ims_getters.c +++ b/lib/ims/ims_getters.c @@ -132,9 +132,9 @@ str cscf_get_private_identity(struct sip_msg *msg, str realm) { } if (realm.len && realm.s) { - ret = find_credentials(msg, &realm, HDR_AUTHORIZATION_F, &h); + ret = find_credentials(msg, &realm, HDR_AUTHORIZATION_T, &h); if (ret < 0) { - ret = find_credentials(msg, &realm, HDR_PROXYAUTH_F, &h); + ret = find_credentials(msg, &realm, HDR_PROXYAUTH_T, &h); if (ret < 0) { goto fallback; } else { @@ -202,7 +202,7 @@ str cscf_get_private_identity_from(struct sip_msg *msg, str realm) } if (realm.len && realm.s) { - ret = find_credentials(msg, &realm, HDR_AUTHORIZATION_F, &h); + ret = find_credentials(msg, &realm, HDR_AUTHORIZATION_T, &h); if (ret < 0) { goto fallback; } else diff --git a/modules/ims_auth/utils.c b/modules/ims_auth/utils.c index fbc8ee7..aca0ca4 100644 --- a/modules/ims_auth/utils.c +++ b/modules/ims_auth/utils.c @@ -239,7 +239,7 @@ str ims_get_auts(struct sip_msg *msg, str realm, int is_proxy_auth) return auts; } - ret = find_credentials(msg, &realm, is_proxy_auth ? HDR_PROXYAUTH_F : HDR_AUTHORIZATION_F, &h); + ret = find_credentials(msg, &realm, is_proxy_auth ? HDR_PROXYAUTH_T : HDR_AUTHORIZATION_T, &h); if (ret < 0) { LM_ERR("Error while looking for credentials.\n"); return auts; @@ -283,7 +283,7 @@ str ims_get_nonce(struct sip_msg *msg, str realm) return nonce; } - ret = find_credentials(msg, &realm, HDR_AUTHORIZATION_F, &h); + ret = find_credentials(msg, &realm, HDR_AUTHORIZATION_T, &h); if (ret < 0) { LM_ERR("Error while looking for credentials.\n"); return nonce; diff --git a/modules/ims_dialog/dlg_hash.c b/modules/ims_dialog/dlg_hash.c index 26817ac..cc6db50 100644 --- a/modules/ims_dialog/dlg_hash.c +++ b/modules/ims_dialog/dlg_hash.c @@ -671,7 +671,7 @@ void dlg_remove_dlg_out(struct dlg_cell_out *dlg_out_do_not_remove, struct dlg_c LM_DBG("This is the dlg_out not to be removed!\n"); } else { //check if this the last entry in the entry_table - if ((d_entry_out->first == d_entry_out->last)) { + if (d_entry_out->first == d_entry_out->last) { //we shouldnt ever get here LM_DBG("This is the last dlg_out_entry in the dlg_entries_out\n"); //this is the last then set entry_out-> first and entry_out->last to zero