From 2239860eee89797d67bd7d6512ab07682359ab2d Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Wed, 29 Aug 2007 18:40:29 +0000
Subject: [PATCH] Remove curl initialization code.

---
 xmltooling/util/CurlNetAccessor.cpp | 35 -----------------------------------
 xmltooling/util/CurlNetAccessor.hpp |  4 ----
 2 files changed, 39 deletions(-)

diff --git a/xmltooling/util/CurlNetAccessor.cpp b/xmltooling/util/CurlNetAccessor.cpp
index 6224f20..4e255b5 100644
--- a/xmltooling/util/CurlNetAccessor.cpp
+++ b/xmltooling/util/CurlNetAccessor.cpp
@@ -40,47 +40,13 @@ const XMLCh CurlNetAccessor::fgMyName[] =
 
 CurlNetAccessor::CurlNetAccessor()
 {
-	initCurl();
 }
 
 
 CurlNetAccessor::~CurlNetAccessor()
 {
-	cleanupCurl();
 }
 
-
-//
-// Global once-only init and cleanup of curl
-//
-// The init count used here is not thread protected; we assume
-// that creation of the CurlNetAccessor will be serialized by
-// the application. If the application is also using curl, then
-// care must be taken that curl is initialized only once, by some
-// other means, or by overloading these methods.
-//
-int CurlNetAccessor::fgCurlInitCount = 0;
-
-void
-CurlNetAccessor::initCurl()
-{
-	if (fgCurlInitCount++ == 0)
-		curl_global_init(	0
-						  | CURL_GLOBAL_ALL			// Initialize all curl modules
-					//	  | CURL_GLOBAL_WIN32		// Initialize Windows sockets first
-					//	  | CURL_GLOBAL_SSL			// Initialize SSL first
-						  );
-}
-
-
-void
-CurlNetAccessor::cleanupCurl()
-{
-	if (fgCurlInitCount > 0 && --fgCurlInitCount == 0)
-		curl_global_cleanup();
-}
-
-
 BinInputStream*
 CurlNetAccessor::makeNew(const XMLURL&  urlSource, const XMLNetHTTPInfo* httpInfo/*=0*/)
 {
@@ -90,4 +56,3 @@ CurlNetAccessor::makeNew(const XMLURL&  urlSource, const XMLNetHTTPInfo* httpInf
 		new (urlSource.getMemoryManager()) CurlURLInputStream(urlSource, httpInfo);
 	return retStrm;            
 }
-
diff --git a/xmltooling/util/CurlNetAccessor.hpp b/xmltooling/util/CurlNetAccessor.hpp
index 4aabcea..a032d57 100644
--- a/xmltooling/util/CurlNetAccessor.hpp
+++ b/xmltooling/util/CurlNetAccessor.hpp
@@ -46,11 +46,7 @@ public :
     virtual BinInputStream* makeNew(const XMLURL&  urlSource, const XMLNetHTTPInfo* httpInfo=0);
     virtual const XMLCh* getId() const;
 
-    virtual void initCurl(void);
-    virtual void cleanupCurl(void);
-
 private :
-	static int fgCurlInitCount;
     static const XMLCh fgMyName[];
 
     CurlNetAccessor(const CurlNetAccessor&);
-- 
2.1.4