-rw-r--r-- | include/opkele/curl.h | 20 | ||||
-rw-r--r-- | lib/curl.cc | 20 |
2 files changed, 40 insertions, 0 deletions
diff --git a/include/opkele/curl.h b/include/opkele/curl.h index 5cf8e48..bcaf11d 100644 --- a/include/opkele/curl.h +++ b/include/opkele/curl.h @@ -3,41 +3,61 @@ #include <cassert> #include <string> #include <algorithm> #include <curl/curl.h> namespace opkele { using std::min; using std::string; namespace util { + class curl_slist_t { + public: + curl_slist *_s; + + curl_slist_t() : _s(0) { } + curl_slist_t(curl_slist *s) : _s(s) { } + virtual ~curl_slist_t() throw(); + + curl_slist_t& operator=(curl_slist *s); + + operator const curl_slist*(void) const { return _s; } + operator curl_slist*(void) { return _s; } + + void append(const char *str); + void append(const string& str) { + append(str.c_str()); } + }; + 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); } + inline CURLcode easy_setopt(CURLoption o,const curl_slist_t& p) { + assert(_c); return curl_easy_setopt(_c,o,(const curl_slist*)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(); diff --git a/lib/curl.cc b/lib/curl.cc index 6172828..734e2ca 100644 --- a/lib/curl.cc +++ b/lib/curl.cc @@ -1,20 +1,40 @@ +#include <opkele/exception.h> #include <opkele/curl.h> #include "config.h" namespace opkele { namespace util { + curl_slist_t::~curl_slist_t() throw() { + if(_s) + curl_slist_free_all(_s); + } + + curl_slist_t& curl_slist_t::operator=(curl_slist *s) { + if(_s) + curl_slist_free_all(_s); + _s = s; + return *this; + } + + void curl_slist_t::append(const char *str) { + curl_slist *s = curl_slist_append(_s,str); + if(!s) + throw opkele::exception(OPKELE_CP_ "failed to curl_slist_append()"); + _s=s; + } + curl_t::~curl_t() throw() { if(_c) curl_easy_cleanup(_c); } curl_t& curl_t::operator=(CURL *c) { if(_c) curl_easy_cleanup(_c); _c = c; return *this; } |