author | Michael Krelin <hacker@klever.net> | 2008-03-04 21:29:52 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2008-03-04 21:29:52 (UTC) |
commit | 1e3ed01c149aaeed5a64aacff218a5486128fc92 (patch) (unidiff) | |
tree | 9eede5ee850d3f1cb46b00daf3a9d698d5af884d | |
parent | a7429a01d86dfde646332b25902f99ccf7f81934 (diff) | |
download | libopkele-1e3ed01c149aaeed5a64aacff218a5486128fc92.zip libopkele-1e3ed01c149aaeed5a64aacff218a5486128fc92.tar.gz libopkele-1e3ed01c149aaeed5a64aacff218a5486128fc92.tar.bz2 |
added curl_slist wrapper
Signed-off-by: Michael Krelin <hacker@klever.net>
-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 | |||
@@ -1,47 +1,67 @@ | |||
1 | #ifndef __OPKELE_CURL_H | 1 | #ifndef __OPKELE_CURL_H |
2 | #define __OPKELE_CURL_H | 2 | #define __OPKELE_CURL_H |
3 | 3 | ||
4 | #include <cassert> | 4 | #include <cassert> |
5 | #include <string> | 5 | #include <string> |
6 | #include <algorithm> | 6 | #include <algorithm> |
7 | #include <curl/curl.h> | 7 | #include <curl/curl.h> |
8 | 8 | ||
9 | namespace opkele { | 9 | namespace opkele { |
10 | using std::min; | 10 | using std::min; |
11 | using std::string; | 11 | using std::string; |
12 | 12 | ||
13 | namespace util { | 13 | namespace util { |
14 | 14 | ||
15 | class curl_slist_t { | ||
16 | public: | ||
17 | curl_slist *_s; | ||
18 | |||
19 | curl_slist_t() : _s(0) { } | ||
20 | curl_slist_t(curl_slist *s) : _s(s) { } | ||
21 | virtual ~curl_slist_t() throw(); | ||
22 | |||
23 | curl_slist_t& operator=(curl_slist *s); | ||
24 | |||
25 | operator const curl_slist*(void) const { return _s; } | ||
26 | operator curl_slist*(void) { return _s; } | ||
27 | |||
28 | void append(const char *str); | ||
29 | void append(const string& str) { | ||
30 | append(str.c_str()); } | ||
31 | }; | ||
32 | |||
15 | class curl_t { | 33 | class curl_t { |
16 | public: | 34 | public: |
17 | CURL *_c; | 35 | CURL *_c; |
18 | 36 | ||
19 | curl_t() : _c(0) { } | 37 | curl_t() : _c(0) { } |
20 | curl_t(CURL *c) : _c(c) { } | 38 | curl_t(CURL *c) : _c(c) { } |
21 | virtual ~curl_t() throw(); | 39 | virtual ~curl_t() throw(); |
22 | 40 | ||
23 | curl_t& operator=(CURL *c); | 41 | curl_t& operator=(CURL *c); |
24 | 42 | ||
25 | operator const CURL*(void) const { return _c; } | 43 | operator const CURL*(void) const { return _c; } |
26 | operator CURL*(void) { return _c; } | 44 | operator CURL*(void) { return _c; } |
27 | 45 | ||
28 | CURLcode misc_sets(); | 46 | CURLcode misc_sets(); |
29 | 47 | ||
30 | template<typename PT> | 48 | template<typename PT> |
31 | inline CURLcode easy_setopt(CURLoption o,PT p) { assert(_c); return curl_easy_setopt(_c,o,p); } | 49 | inline CURLcode easy_setopt(CURLoption o,PT p) { assert(_c); return curl_easy_setopt(_c,o,p); } |
50 | inline CURLcode easy_setopt(CURLoption o,const curl_slist_t& p) { | ||
51 | assert(_c); return curl_easy_setopt(_c,o,(const curl_slist*)p); } | ||
32 | CURLcode easy_perform() { assert(_c); return curl_easy_perform(_c); } | 52 | CURLcode easy_perform() { assert(_c); return curl_easy_perform(_c); } |
33 | template<typename IT> | 53 | template<typename IT> |
34 | inline CURLcode easy_getinfo(CURLINFO i,IT p) { assert(_c); return curl_easy_getinfo(_c,i,p); } | 54 | inline CURLcode easy_getinfo(CURLINFO i,IT p) { assert(_c); return curl_easy_getinfo(_c,i,p); } |
35 | 55 | ||
36 | static inline CURL *easy_init() { return curl_easy_init(); } | 56 | static inline CURL *easy_init() { return curl_easy_init(); } |
37 | 57 | ||
38 | virtual size_t write(void* /* p */,size_t /* s */,size_t /* nm */) { return 0; } | 58 | virtual size_t write(void* /* p */,size_t /* s */,size_t /* nm */) { return 0; } |
39 | CURLcode set_write(); | 59 | CURLcode set_write(); |
40 | 60 | ||
41 | virtual int progress(double /* dlt */,double /* dln*/ ,double /* ult */,double /* uln */) { return 0; } | 61 | virtual int progress(double /* dlt */,double /* dln*/ ,double /* ult */,double /* uln */) { return 0; } |
42 | CURLcode set_progress(); | 62 | CURLcode set_progress(); |
43 | 63 | ||
44 | virtual size_t header(void* /* p */,size_t s,size_t nm) { return s*nm; } | 64 | virtual size_t header(void* /* p */,size_t s,size_t nm) { return s*nm; } |
45 | CURLcode set_header(); | 65 | CURLcode set_header(); |
46 | }; | 66 | }; |
47 | 67 | ||
diff --git a/lib/curl.cc b/lib/curl.cc index 6172828..734e2ca 100644 --- a/lib/curl.cc +++ b/lib/curl.cc | |||
@@ -1,24 +1,44 @@ | |||
1 | #include <opkele/exception.h> | ||
1 | #include <opkele/curl.h> | 2 | #include <opkele/curl.h> |
2 | 3 | ||
3 | #include "config.h" | 4 | #include "config.h" |
4 | 5 | ||
5 | namespace opkele { | 6 | namespace opkele { |
6 | 7 | ||
7 | namespace util { | 8 | namespace util { |
8 | 9 | ||
10 | curl_slist_t::~curl_slist_t() throw() { | ||
11 | if(_s) | ||
12 | curl_slist_free_all(_s); | ||
13 | } | ||
14 | |||
15 | curl_slist_t& curl_slist_t::operator=(curl_slist *s) { | ||
16 | if(_s) | ||
17 | curl_slist_free_all(_s); | ||
18 | _s = s; | ||
19 | return *this; | ||
20 | } | ||
21 | |||
22 | void curl_slist_t::append(const char *str) { | ||
23 | curl_slist *s = curl_slist_append(_s,str); | ||
24 | if(!s) | ||
25 | throw opkele::exception(OPKELE_CP_ "failed to curl_slist_append()"); | ||
26 | _s=s; | ||
27 | } | ||
28 | |||
9 | curl_t::~curl_t() throw() { | 29 | curl_t::~curl_t() throw() { |
10 | if(_c) | 30 | if(_c) |
11 | curl_easy_cleanup(_c); | 31 | curl_easy_cleanup(_c); |
12 | } | 32 | } |
13 | 33 | ||
14 | curl_t& curl_t::operator=(CURL *c) { | 34 | curl_t& curl_t::operator=(CURL *c) { |
15 | if(_c) | 35 | if(_c) |
16 | curl_easy_cleanup(_c); | 36 | curl_easy_cleanup(_c); |
17 | _c = c; | 37 | _c = c; |
18 | return *this; | 38 | return *this; |
19 | } | 39 | } |
20 | 40 | ||
21 | CURLcode curl_t::misc_sets() { | 41 | CURLcode curl_t::misc_sets() { |
22 | assert(_c); | 42 | assert(_c); |
23 | CURLcode r; | 43 | CURLcode r; |
24 | (r=easy_setopt(CURLOPT_FOLLOWLOCATION,1)) | 44 | (r=easy_setopt(CURLOPT_FOLLOWLOCATION,1)) |