[sr-dev] git:master:d493d3fa: Merge pull request #395 from mslehto/ims_clang_errors

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: d493d3fa4f052bb3958599b395f7a4d2fe0a9d91
URL: https://github.com/kamailio/kamailio/commit/d493d3fa4f052bb3958599b395f7a4d2fe0a9d91

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2015-11-12T12:10:59+01:00

Merge pull request #395 from mslehto/ims_clang_errors

patches to fix some clang errors and warnings

---

Modified: modules/ims_charging/ro_session_hash.h
Modified: modules/ims_charging/ro_timer.c
Modified: modules/ims_registrar_scscf/cxdx_sar.c
Modified: modules/ims_usrloc_scscf/hslot.h

---

Diff:  https://github.com/kamailio/kamailio/commit/d493d3fa4f052bb3958599b395f7a4d2fe0a9d91.diff
Patch: https://github.com/kamailio/kamailio/commit/d493d3fa4f052bb3958599b395f7a4d2fe0a9d91.patch

---

diff --git a/modules/ims_charging/ro_session_hash.h b/modules/ims_charging/ro_session_hash.h
index 7257721..7aa1b89 100644
--- a/modules/ims_charging/ro_session_hash.h
+++ b/modules/ims_charging/ro_session_hash.h
@@ -175,7 +175,8 @@ int init_ro_session_table(unsigned int size);
 /*!
  * \brief Destroy the ro_session dialog table
  */
-void destroy_ro_session_table(void);
+void destroy_ro_session(struct ro_session *ro_session);
+
 
 /*!
  * \brief Link a ro_session structure
diff --git a/modules/ims_charging/ro_timer.c b/modules/ims_charging/ro_timer.c
index df1fc59..f5978d6 100644
--- a/modules/ims_charging/ro_timer.c
+++ b/modules/ims_charging/ro_timer.c
@@ -409,7 +409,7 @@ void ro_session_ontimeout(struct ro_tl *tl) {
             counter_add(ims_charging_cnts_h.billed_secs, used_secs);
 
             if (ro_session->callid.s != NULL
-                    && ro_session->dlg_h_entry >= 0
+                    && ro_session->dlg_h_entry > 0
                     && ro_session->dlg_h_id > 0
                     && ro_session->ro_session_id.s != NULL) {
                 LM_DBG("Found a session to re-apply for timing [%.*s] and user is [%.*s]\n",
diff --git a/modules/ims_registrar_scscf/cxdx_sar.c b/modules/ims_registrar_scscf/cxdx_sar.c
index d6ded97..bfdc09d 100644
--- a/modules/ims_registrar_scscf/cxdx_sar.c
+++ b/modules/ims_registrar_scscf/cxdx_sar.c
@@ -330,7 +330,7 @@ int cxdx_send_sar(struct sip_msg *msg, str public_identity, str private_identity
     }
     if (!sar) goto error1;
 
-    if (!cxdx_add_call_id(sar, cscf_get_call_id(msg, &hdr)));
+    if (!cxdx_add_call_id(sar, cscf_get_call_id(msg, &hdr))) goto error1;
     if (!cxdx_add_destination_realm(sar, cxdx_dest_realm)) goto error1;
 
     if (!cxdx_add_vendor_specific_appid(sar, IMS_vendor_id_3GPP, IMS_Cx, 0 /*IMS_Cx*/)) goto error1;
diff --git a/modules/ims_usrloc_scscf/hslot.h b/modules/ims_usrloc_scscf/hslot.h
index 614962d..3379360 100644
--- a/modules/ims_usrloc_scscf/hslot.h
+++ b/modules/ims_usrloc_scscf/hslot.h
@@ -47,6 +47,7 @@
 #define HSLOT_H
 
 #include "../../locking.h"
+#include "../../atomic/atomic_common.h"
 
 #include "udomain.h"
 #include "impurecord.h"