X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Finit_globals.c;h=5442c4be311bf0eefb2888c373929aba157297c9;hb=4e71d4a715bca8fc6a9a1010ffa00def8c63ab1b;hp=6bd03fb0db02c6a9d99224454f4ec356268e1771;hpb=ae102dcb4c5a0429f4ebdbb6ecb60b1cc437f8e4;p=yaz-moved-to-github.git

diff --git a/src/init_globals.c b/src/init_globals.c
index 6bd03fb..5442c4b 100644
--- a/src/init_globals.c
+++ b/src/init_globals.c
@@ -12,6 +12,8 @@
 #include <config.h>
 #endif
 
+#include <yaz/log.h>
+
 #if YAZ_POSIX_THREADS
 #include <pthread.h>
 #endif
@@ -21,8 +23,12 @@
 #include <gnutls/gnutls.h>
 #endif
 
-#if HAVE_GCRYPT_H
-#include <gcrypt.h>
+#if YAZ_HAVE_XML2
+#include <libxml/parser.h>
+#endif
+
+#if YAZ_HAVE_XSLT
+#include <libxslt/xslt.h>
 #endif
 
 #if YAZ_HAVE_EXSLT
@@ -35,10 +41,7 @@ static pthread_mutex_t yaz_init_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif
 
 extern void yaz_log_init_globals(void);
-
-#if HAVE_GCRYPT_H
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
-#endif
+extern void yaz_log_deinit_globals(void);
 
 void yaz_init_globals(void)
 {
@@ -50,19 +53,14 @@ void yaz_init_globals(void)
     if (!yaz_init_flag)
     {
         yaz_log_init_globals();
-#if HAVE_GCRYPT_H
-        /* POSIX threads locking. In case gnutls_global_init do not override */
-        gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
-#endif
 #if HAVE_GNUTLS_H
         gnutls_global_init();
 #endif
-#if HAVE_GCRYPT_H
-        /* most likely, GnuTLS has already initialized libgcrypt */
-        if (gcry_control(GCRYCTL_ANY_INITIALIZATION_P) == 0)
-        {
-            gcry_control(GCRYCTL_INITIALIZATION_FINISHED, NULL, 0);
-        }
+#if YAZ_HAVE_XML2
+        xmlInitParser();
+#endif
+#if YAZ_HAVE_XSLT
+        xsltInit();
 #endif
 #if YAZ_HAVE_EXSLT
         exsltRegisterAll();
@@ -74,6 +72,32 @@ void yaz_init_globals(void)
 #endif
 }
 
+void yaz_deinit_globals(void)
+{
+    if (!yaz_init_flag)
+        return;
+#if YAZ_POSIX_THREADS
+    pthread_mutex_lock(&yaz_init_mutex);
+#endif
+    if (yaz_init_flag)
+    {
+        yaz_log_deinit_globals();
+#if HAVE_GNUTLS_H
+        gnutls_global_deinit();
+#endif
+#if YAZ_HAVE_XSLT
+        xsltCleanupGlobals();
+#endif
+#if YAZ_HAVE_XML2
+        xmlCleanupParser();
+#endif
+        yaz_init_flag = 0;
+    }
+#if YAZ_POSIX_THREADS
+    pthread_mutex_unlock(&yaz_init_mutex);
+#endif
+}
+
 /*
  * Local variables:
  * c-basic-offset: 4