Rename session mutex to session_mutex

diff --git a/src/session.c b/src/session.c
index aad56ea..94ffdd2 100644 (file)
--- 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)
 {
 
 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)
 {
 }
 
 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.
 }
 
 // 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);
     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);
 }
 
     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->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;
 }
 
     return session;
 }

diff --git a/src/session.h b/src/session.h
index 0bafe72..e8eceb7 100644 (file)
--- 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;
     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 {
 };
 
 struct statistics {