1 files changed, 8 insertions, 65 deletions

diff --git a/src/gnutls/init.c b/src/gnutls/init.c
index 8ca5cd28..3dd656b1 100644
--- a/src/gnutls/init.c
+++ b/src/gnutls/init.c
@@ -18,12 +18,9 @@
 */
 
 /**
- * @file lib/init.c
- * @brief initialization routines
+ * @file gnutls/init.c
+ * @brief gnutls-specific initialization routines
  * @author Christian Grothoff
- *
- * TODO: most of this is only required for gcrypt/GNUtls,
- * should probably be moved to TLS plugin!
  */
 #include "internal.h"
 #include "init.h"
@@ -35,6 +32,7 @@
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
 #elif defined(MHD_W32_MUTEX_)
 
+
 static int
 gcry_w32_mutex_init (void **ppmtx)
 {
@@ -42,13 +40,12 @@ gcry_w32_mutex_init (void **ppmtx)
 
   if (NULL == *ppmtx)
     return ENOMEM;
-  if (!MHD_mutex_init_ ((MHD_mutex_*)*ppmtx))
+  if (! MHD_mutex_init_ ((MHD_mutex_*)*ppmtx))
     {
       free (*ppmtx);
       *ppmtx = NULL;
       return EPERM;
     }
-
   return 0;
 }
 
@@ -108,7 +105,7 @@ MHD_MUTEX_STATIC_DEFN_INIT_(global_init_mutex_);
  * and call initialiser if necessary.
  */
 void
-MHD_check_global_init_ (void)
+MHD_TLS_check_global_init_ (void)
 {
 #ifdef MHD_MUTEX_STATIC_DEFN_INIT_
   MHD_mutex_lock_chk_(&global_init_mutex_);
@@ -122,57 +119,15 @@ MHD_check_global_init_ (void)
 
 
 /**
- * Default implementation of the panic function,
- * prints an error message and aborts.
- *
- * @param cls unused
- * @param file name of the file with the problem
- * @param line line number with the problem
- * @param reason error message with details
- */
-static void
-mhd_panic_std (void *cls,
-               const char *file,
-               unsigned int line,
-               const char *reason)
-{
-  (void)cls; /* Mute compiler warning. */
-#ifdef HAVE_MESSAGES
-  fprintf (stderr,
-           _("Fatal error in GNU libmicrohttpd %s:%u: %s\n"),
-           file,
-           line,
-           reason);
-#else  /* ! HAVE_MESSAGES */
-  (void)file;   /* Mute compiler warning. */
-  (void)line;   /* Mute compiler warning. */
-  (void)reason; /* Mute compiler warning. */
-#endif
-  abort ();
-}
-
-
-/**
  * Initialize do setup work.
  */
 void
-MHD_init(void)
+MHD_TLS_init (void)
 {
 #if defined(_WIN32) && ! defined(__CYGWIN__)
   WSADATA wsd;
 #endif /* _WIN32 && ! __CYGWIN__ */
 
-  if (NULL == mhd_panic)
-    mhd_panic = &mhd_panic_std;
-
-#if defined(_WIN32) && ! defined(__CYGWIN__)
-  if (0 != WSAStartup(MAKEWORD(2, 2), &wsd))
-    MHD_PANIC (_("Failed to initialize winsock\n"));
-  mhd_winsock_inited_ = 1;
-  if (2 != LOBYTE(wsd.wVersion) && 2 != HIBYTE(wsd.wVersion))
-    MHD_PANIC (_("Winsock version 2.2 is not available\n"));
-#endif
-#ifdef HTTPS_SUPPORT
 #ifdef MHD_HTTPS_REQUIRE_GRYPT
 #if GCRYPT_VERSION_NUMBER < 0x010600
 #if defined(MHD_USE_POSIX_THREADS)
@@ -191,27 +146,15 @@ MHD_init(void)
 #endif
 #endif /* MHD_HTTPS_REQUIRE_GRYPT */
   gnutls_global_init ();
-#endif /* HTTPS_SUPPORT */
-  MHD_monotonic_sec_counter_init();
-#ifdef HAVE_FREEBSD_SENDFILE
-  MHD_conn_init_static_ ();
-#endif /* HAVE_FREEBSD_SENDFILE */
 }
 
 
 void
-MHD_fini(void)
+MHD_TLS_fini(void)
 {
-#ifdef HTTPS_SUPPORT
   gnutls_global_deinit ();
-#endif /* HTTPS_SUPPORT */
-#if defined(_WIN32) && ! defined(__CYGWIN__)
-  if (mhd_winsock_inited_)
-    WSACleanup();
-#endif
-  MHD_monotonic_sec_counter_finish();
 }
 
 #ifdef _AUTOINIT_FUNCS_ARE_SUPPORTED
-_SET_INIT_AND_DEINIT_FUNCS(MHD_init, MHD_fini);
+_SET_INIT_AND_DEINIT_FUNCS(MHD_TLS_init, MHD_TLS_fini);
 #endif /* _AUTOINIT_FUNCS_ARE_SUPPORTED */