changed webserver interface to remove dangerous methods

Sebastiano Merlino · Sebastiano Merlino · commit 918dd33cdbb5 · 2013-01-01T16:13:40.000+01:00
diff --git a/src/httpserver/webserver.hpp b/src/httpserver/webserver.hpp
@@ -268,9 +268,7 @@ class webserver
 
         http_response* get_from_cache(const std::string& key, bool* valid, bool lock = false, bool write = false);
         http_response* get_from_cache(const std::string& key, bool* valid, cache_entry** ce, bool lock = false, bool write = false);
-        void lock_cache_element(const std::string& key, bool write = false);
         void lock_cache_element(cache_entry* ce, bool write = false);
-        void unlock_cache_element(const std::string& key);
         void unlock_cache_element(cache_entry* ce);
         cache_entry* put_in_cache(const std::string& key, http_response* value, bool* new_elem, bool lock = false, bool write = false, int validity = -1);
         void remove_from_cache(const std::string& key);
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -1791,34 +1791,12 @@ bool webserver::is_valid(const std::string& key)
     return false;
 }
 
-void webserver::lock_cache_element(const std::string& key, bool write)
-{
-    pthread_rwlock_rdlock(&cache_guard);
-    map<string, cache_entry*>::iterator it(response_cache.find(key));
-    if(it != response_cache.end())
-    {
-        pthread_rwlock_unlock(&cache_guard);
-        (*it).second->lock(write);
-    }
-    else
-        pthread_rwlock_unlock(&cache_guard);
-}
-
 void webserver::lock_cache_element(cache_entry* ce, bool write)
 {
     if(ce)
         ce->lock(write);
 }
 
-void webserver::unlock_cache_element(const std::string& key)
-{
-    pthread_rwlock_rdlock(&cache_guard);
-    map<string, cache_entry*>::iterator it(response_cache.find(key));
-    if(it != response_cache.end())
-        (*it).second->unlock();
-    pthread_rwlock_unlock(&cache_guard);
-}
-
 void webserver::unlock_cache_element(cache_entry* ce)
 {
     if(ce)
