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
@@ -1,48 +1,72 @@
 #ifndef __OPKELE_CURL_H
 #define __OPKELE_CURL_H
 
 #include <cassert>
+#include <string>
+#include <algorithm>
 #include <curl/curl.h>
 
 namespace opkele {
+    using std::min;
+    using std::string;
 
     namespace util {
 
 	class curl_t {
 	    public:
 		CURL *_c;
 
 		curl_t() : _c(0) { }
 		curl_t(CURL *c) : _c(c) { }
 		virtual ~curl_t() throw();
 
 		curl_t& operator=(CURL *c);
 
 		operator const CURL*(void) const { return _c; }
 		operator CURL*(void) { return _c; }
 
 		CURLcode misc_sets();
 
 		template<typename PT>
 		    inline CURLcode easy_setopt(CURLoption o,PT p) { assert(_c); return curl_easy_setopt(_c,o,p); }
 		CURLcode easy_perform() { assert(_c); return curl_easy_perform(_c); }
 		template<typename IT>
 		    inline CURLcode easy_getinfo(CURLINFO i,IT p) { assert(_c); return curl_easy_getinfo(_c,i,p); }
 
 		static inline CURL *easy_init() { return curl_easy_init(); }
 
 		virtual size_t write(void* /* p */,size_t /* s */,size_t /* nm */) { return 0; }
 		CURLcode set_write();
 
 		virtual int progress(double /* dlt */,double /* dln*/ ,double /* ult */,double /* uln */) { return 0; }
 		CURLcode set_progress();
 
 		virtual size_t header(void* /* p */,size_t s,size_t nm) { return s*nm; }
 		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;
+
+
     }
 
 }
 
 #endif /* __OPKELE_CURL_H */
diff --git a/lib/consumer.cc b/lib/consumer.cc
index 9f7530f..3c3b4f8 100644
--- a/lib/consumer.cc
+++ b/lib/consumer.cc
@@ -1,62 +1,44 @@
 #include <algorithm>
 #include <cassert>
 #include <cstring>
 #include <opkele/util.h>
 #include <opkele/curl.h>
 #include <opkele/exception.h>
 #include <opkele/data.h>
 #include <opkele/consumer.h>
 #include <openssl/sha.h>
 #include <openssl/hmac.h>
 #include <iostream>
 
 #include "config.h"
 
 #include <pcre.h>
 
 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:
 	    int *_ov;
 	    int _s;
 
 	    pcre_matches_t() : _ov(0), _s(0) { }
 	    pcre_matches_t(int s) : _ov(0), _s(s) {
 		if(_s&1) ++_s;
 		_s += _s>>1;
 		_ov = new int[_s];
 	    }
 	    ~pcre_matches_t() throw() { if(_ov) delete[] _ov; }
 
 	    int begin(int i) const { return _ov[i<<1]; }
 	    int end(int i) const { return _ov[(i<<1)+1]; }
 	    int length(int i) const { int t=i<<1; return _ov[t+1]-_ov[t]; }
     };
 
     class pcre_t {
 	public:
 	    pcre *_p;
 
 	    pcre_t() : _p(0) { }