From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 4 Nov 2011 13:34:35 +0000 (+0100)
Subject: Remove destroy_session - replaced by session_destroy.
X-Git-Tag: mobile-beta-1~3^2~7
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=29d7b058269704d060ab5a39c9cec515cd8d7d87;p=pazpar2-moved-to-github.git

Remove destroy_session - replaced by session_destroy.
---

diff --git a/src/http_command.c b/src/http_command.c
index a86aabb..7b296c7 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -126,7 +126,7 @@ void http_sessions_destroy(http_sessions_t hs)
         {
             struct http_session *s_next = s->next;
             iochan_destroy(s->timeout_iochan);
-            destroy_session(s->psession);
+            session_destroy(s->psession);
             nmem_destroy(s->nmem);
             s = s_next;
         }
@@ -199,7 +199,7 @@ void http_session_destroy(struct http_session *s)
     {   /* destroying for real */
         yaz_log(http_sessions->log_level, "%p HTTP Session %u destroyed", s, s->session_id);
         iochan_destroy(s->timeout_iochan);
-        destroy_session(s->psession);
+        session_destroy(s->psession);
         http_session_use(-1);
         nmem_destroy(s->nmem);
     }
diff --git a/src/session.c b/src/session.c
index 439ad7b..21a4729 100644
--- a/src/session.c
+++ b/src/session.c
@@ -869,12 +869,6 @@ void session_destroy(struct session *se) {
     yaz_mutex_destroy(&se->session_mutex);
 }
 
-/* Depreciated: use session_destroy */
-void destroy_session(struct session *se)
-{
-    session_destroy(se);
-}
-
 size_t session_get_memory_status(struct session *session) {
     size_t session_nmem;
     if (session == 0)
diff --git a/src/session.h b/src/session.h
index 13bc314..f1d6764 100644
--- a/src/session.h
+++ b/src/session.h
@@ -144,7 +144,7 @@ struct hitsbytarget {
 struct hitsbytarget *get_hitsbytarget(struct session *s, int *count, NMEM nmem);
 struct session *new_session(NMEM nmem, struct conf_service *service,
                             unsigned session_id);
-void destroy_session(struct session *s);
+void session_destroy(struct session *s);
 void session_init_databases(struct session *s);
 void statistics(struct session *s, struct statistics *stat);