From 8ffa7e44afe1ae74ec07278d0bcc93b388c39871 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 21 Apr 2010 15:17:33 +0200 Subject: [PATCH] Rename session mutex to session_mutex --- src/session.c | 11 +++++------ src/session.h | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/session.c b/src/session.c index aad56ea..94ffdd2 100644 --- a/src/session.c +++ b/src/session.c @@ -106,12 +106,12 @@ static void log_xml_doc(xmlDoc *doc) static void session_enter(struct session *s) { - yaz_mutex_enter(s->mutex); + yaz_mutex_enter(s->session_mutex); } static void session_leave(struct session *s) { - yaz_mutex_leave(s->mutex); + yaz_mutex_leave(s->session_mutex); } // Recursively traverse query structure to extract terms. @@ -669,7 +669,7 @@ void destroy_session(struct session *s) reclist_destroy(s->reclist); nmem_destroy(s->nmem); service_destroy(s->service); - yaz_mutex_destroy(&s->mutex); + yaz_mutex_destroy(&s->session_mutex); wrbuf_destroy(s->wrbuf); } @@ -700,9 +700,8 @@ struct session *new_session(NMEM nmem, struct conf_service *service, session->watchlist[i].fun = 0; } session->normalize_cache = normalize_cache_create(); - session->mutex = 0; - - pazpar2_mutex_create(&session->mutex, name); + session->session_mutex = 0; + pazpar2_mutex_create(&session->session_mutex, name); return session; } diff --git a/src/session.h b/src/session.h index 0bafe72..e8eceb7 100644 --- a/src/session.h +++ b/src/session.h @@ -118,7 +118,7 @@ struct session { int number_of_warnings_unknown_elements; int number_of_warnings_unknown_metadata; normalize_cache_t normalize_cache; - YAZ_MUTEX mutex; + YAZ_MUTEX session_mutex; }; struct statistics { -- 1.7.10.4