-rw-r--r-- | lib/consumer.cc | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/lib/consumer.cc b/lib/consumer.cc index 7881f5f..20f4174 100644 --- a/lib/consumer.cc +++ b/lib/consumer.cc | |||
@@ -4,2 +4,3 @@ | |||
4 | #include <opkele/util.h> | 4 | #include <opkele/util.h> |
5 | #include <opkele/curl.h> | ||
5 | #include <opkele/exception.h> | 6 | #include <opkele/exception.h> |
@@ -9,4 +10,2 @@ | |||
9 | #include <openssl/hmac.h> | 10 | #include <openssl/hmac.h> |
10 | #include <curl/curl.h> | ||
11 | |||
12 | #include <iostream> | 11 | #include <iostream> |
@@ -64,16 +63,2 @@ namespace opkele { | |||
64 | 63 | ||
65 | class curl_t { | ||
66 | public: | ||
67 | CURL *_c; | ||
68 | |||
69 | curl_t() : _c(0) { } | ||
70 | curl_t(CURL *c) : _c(c) { } | ||
71 | ~curl_t() throw() { if(_c) curl_easy_cleanup(_c); } | ||
72 | |||
73 | curl_t& operator=(CURL *c) { if(_c) curl_easy_cleanup(_c); _c=c; return *this; } | ||
74 | |||
75 | operator const CURL*(void) const { return _c; } | ||
76 | operator CURL*(void) { return _c; } | ||
77 | }; | ||
78 | |||
79 | static CURLcode curl_misc_sets(CURL* c) { | 64 | static CURLcode curl_misc_sets(CURL* c) { |
@@ -118,3 +103,3 @@ namespace opkele { | |||
118 | request += util::url_encode(util::bignum_to_base64(dh->pub_key)); | 103 | request += util::url_encode(util::bignum_to_base64(dh->pub_key)); |
119 | curl_t curl = curl_easy_init(); | 104 | util::curl_t curl = curl_easy_init(); |
120 | if(!curl) | 105 | if(!curl) |
@@ -278,3 +263,3 @@ namespace opkele { | |||
278 | } | 263 | } |
279 | curl_t curl = curl_easy_init(); | 264 | util::curl_t curl = curl_easy_init(); |
280 | if(!curl) | 265 | if(!curl) |
@@ -311,3 +296,3 @@ namespace opkele { | |||
311 | delegate.erase(); | 296 | delegate.erase(); |
312 | curl_t curl = curl_easy_init(); | 297 | util::curl_t curl = curl_easy_init(); |
313 | if(!curl) | 298 | if(!curl) |
@@ -417,3 +402,3 @@ namespace opkele { | |||
417 | string rv = normalize(url); | 402 | string rv = normalize(url); |
418 | curl_t curl = curl_easy_init(); | 403 | util::curl_t curl = curl_easy_init(); |
419 | if(!curl) | 404 | if(!curl) |