[sr-dev] git:master:55d8344d: ims_registrar_scscf: Align ims_registrar_scscf with latest ims_usrloc_scscf

[Carsten Bock]

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

Author: Carsten Bock <carsten at ng-voice.com>
Committer: Carsten Bock <carsten at ng-voice.com>
Date: 2015-05-28T17:36:58+02:00

ims_registrar_scscf: Align ims_registrar_scscf with latest ims_usrloc_scscf

---

Modified: modules/ims_registrar_scscf/save.c
Modified: modules/ims_registrar_scscf/userdata_parser.c

---

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

---

diff --git a/modules/ims_registrar_scscf/save.c b/modules/ims_registrar_scscf/save.c
index 7100b2c..b3ecfac 100644
--- a/modules/ims_registrar_scscf/save.c
+++ b/modules/ims_registrar_scscf/save.c
@@ -474,10 +474,10 @@ void free_ims_subscription_data(ims_subscription *s) {
         shm_free(s->private_identity.s);
     ul.unlock_subscription(s);
 #ifdef EXTRA_DEBUG
-    LM_DBG("SUBSCRIPTION LOCK %p destroyed\n", s->slock);
+    LM_DBG("SUBSCRIPTION LOCK %p destroyed\n", s->lock);
 #endif
-    lock_destroy(s->slock);
-    lock_dealloc(s->slock);
+    lock_destroy(s->lock);
+    lock_dealloc(s->lock);
     shm_free(s);
 
 }
diff --git a/modules/ims_registrar_scscf/userdata_parser.c b/modules/ims_registrar_scscf/userdata_parser.c
index eeeb901..362570b 100644
--- a/modules/ims_registrar_scscf/userdata_parser.c
+++ b/modules/ims_registrar_scscf/userdata_parser.c
@@ -859,21 +859,21 @@ static ims_subscription* parse_ims_subscription(xmlDocPtr doc, xmlNodePtr root)
 				if (rc)
 					s->service_profiles_cnt++;
 			}				
-	s->slock = lock_alloc();
-	if (s->slock==0) {
+	s->lock = lock_alloc();
+	if (s->lock==0) {
 		LM_ERR("Failed to allocate Lock for IMS Subscription\n");
 		shm_free(s);
 		return 0;
 	}
-	if (lock_init(s->slock)==0){
+	if (lock_init(s->lock)==0){
 		LM_ERR("Failed to initialize Lock for IMS Subscription\n");
-		lock_dealloc(s->slock);
-		s->slock=0;
+		lock_dealloc(s->lock);
+		s->lock=0;
 		shm_free(s);
 		return 0;
 	}
 #ifdef EXTRA_DEBUG
-    	LM_DBG("LOCK CREATED FOR SUBSCRIPTION [%.*s]: %p\n", s->private_identity.len, s->private_identity.s, s->slock);
+    	LM_DBG("LOCK CREATED FOR SUBSCRIPTION [%.*s]: %p\n", s->private_identity.len, s->private_identity.s, s->lock);
 #endif
 	return s;
 }