From 23d95cfed1f00087c9ebf54bbabb8ae1bcc0506d Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Wed, 11 Sep 2013 17:50:25 -0400
Subject: [PATCH] * #29736: presence: removed dead code
---
daemon/src/sip/sippresence.cpp | 17 -----------------
daemon/src/sip/sippresence.h | 5 -----
2 files changed, 22 deletions(-)
diff --git a/daemon/src/sip/sippresence.cpp b/daemon/src/sip/sippresence.cpp
index ea259b3d6a..1ef71acf3c 100644
--- a/daemon/src/sip/sippresence.cpp
+++ b/daemon/src/sip/sippresence.cpp
@@ -222,7 +222,6 @@ void SIPPresence::notifyPresSubServer() {
s->notify();
}
-
void SIPPresence::lock()
{
pj_mutex_lock(mutex_);
@@ -237,22 +236,6 @@ void SIPPresence::unlock()
pj_mutex_unlock(mutex_);
}
-bool SIPPresence::tryLock()
-{
- pj_status_t status;
- status = pj_mutex_trylock(mutex_);
- if (status == PJ_SUCCESS) {
- mutex_owner_ = pj_thread_this();
- ++mutex_nesting_level_;
- }
- return status;
-}
-
-bool SIPPresence::isLocked()
-{
- return mutex_owner_ == pj_thread_this();
-}
-
void SIPPresence::fillDoc(pjsip_tx_data *tdata, const pres_msg_data *msg_data)
{
diff --git a/daemon/src/sip/sippresence.h b/daemon/src/sip/sippresence.h
index af8e565428..0d50929b57 100644
--- a/daemon/src/sip/sippresence.h
+++ b/daemon/src/sip/sippresence.h
@@ -209,13 +209,8 @@ public:
return pres_sub_client_list_;
}
- /**
- * Lock methods
- */
void lock();
void unlock();
- bool tryLock();
- bool isLocked();
pjsip_pres_status pres_status_data; /**< Presence Data.*/
pjsip_publishc *publish_sess; /**< Client publication session.*/
--
GitLab