moved curl_fetch_string_t/curl_pick_t classes into curl.h

Signed-off-by: Michael Krelin <hacker@klever.net>

2 files changed, 25 insertions, 19 deletions

diff --git a/include/opkele/curl.h b/include/opkele/curl.h
index 8020b63..5cf8e48 100644
--- a/include/opkele/curl.h
+++ b/include/opkele/curl.h
@@ -2,9 +2,13 @@
 #define __OPKELE_CURL_H
 
 #include <cassert>
+#include <string>
+#include <algorithm>
 #include <curl/curl.h>
 
 namespace opkele {
+    using std::min;
+    using std::string;
 
     namespace util {
 
@@ -41,6 +45,26 @@ namespace opkele {
 		CURLcode set_header();
 	};
 
+	template<int lim>
+	    class curl_fetch_string_t : public curl_t {
+		public:
+		    curl_fetch_string_t(CURL *c)
+			: curl_t(c) { }
+		    ~curl_fetch_string_t() throw() { }
+
+		    string response;
+
+		    size_t write(void *p,size_t size,size_t nmemb) {
+			size_t bytes = size*nmemb;
+			size_t get = min(lim-response.length(),bytes);
+			response.append((const char *)p,get);
+			return get;
+		    }
+	    };
+
+	typedef curl_fetch_string_t<16384> curl_pick_t;
+
+
     }
 
 }
diff --git a/lib/consumer.cc b/lib/consumer.cc
index 9f7530f..3c3b4f8 100644
--- a/lib/consumer.cc
+++ b/lib/consumer.cc
@@ -17,25 +17,7 @@
 namespace opkele {
     using namespace std;
     using util::curl_t;
-
-    template<int lim>
-	class curl_fetch_string_t : public curl_t {
-	    public:
-		curl_fetch_string_t(CURL *c)
-		    : curl_t(c) { }
-		~curl_fetch_string_t() throw() { }
-
-		string response;
-
-		size_t write(void *p,size_t size,size_t nmemb) {
-		    size_t bytes = size*nmemb;
-		    size_t get = min(lim-response.length(),bytes);
-		    response.append((const char *)p,get);
-		    return get;
-		}
-	};
-
-    typedef curl_fetch_string_t<16384> curl_pick_t;
+    using util::curl_pick_t;
 
     class pcre_matches_t {
 	public: