author | Michael Krelin <hacker@klever.net> | 2007-11-28 16:27:46 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-11-28 16:27:46 (UTC) |
commit | 7ddb513bec854479fc9efb2a79044a978055d800 (patch) (unidiff) | |
tree | 741c1810ac66e8b1b5ed879b39757d691c5988b4 | |
parent | bce90cb3dc7f013ed25b5a4e4ba848815f497066 (diff) | |
download | libopkele-7ddb513bec854479fc9efb2a79044a978055d800.zip libopkele-7ddb513bec854479fc9efb2a79044a978055d800.tar.gz libopkele-7ddb513bec854479fc9efb2a79044a978055d800.tar.bz2 |
keep keeping compilers happy
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | include/opkele/curl.h | 6 | ||||
-rw-r--r-- | lib/util.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/opkele/curl.h b/include/opkele/curl.h index 298f095..8020b63 100644 --- a/include/opkele/curl.h +++ b/include/opkele/curl.h | |||
@@ -26,23 +26,23 @@ namespace opkele { | |||
26 | template<typename PT> | 26 | template<typename PT> |
27 | inline CURLcode easy_setopt(CURLoption o,PT p) { assert(_c); return curl_easy_setopt(_c,o,p); } | 27 | inline CURLcode easy_setopt(CURLoption o,PT p) { assert(_c); return curl_easy_setopt(_c,o,p); } |
28 | CURLcode easy_perform() { assert(_c); return curl_easy_perform(_c); } | 28 | CURLcode easy_perform() { assert(_c); return curl_easy_perform(_c); } |
29 | template<typename IT> | 29 | template<typename IT> |
30 | inline CURLcode easy_getinfo(CURLINFO i,IT p) { assert(_c); return curl_easy_getinfo(_c,i,p); } | 30 | inline CURLcode easy_getinfo(CURLINFO i,IT p) { assert(_c); return curl_easy_getinfo(_c,i,p); } |
31 | 31 | ||
32 | static inline CURL *easy_init() { return curl_easy_init(); } | 32 | static inline CURL *easy_init() { return curl_easy_init(); } |
33 | 33 | ||
34 | virtual size_t write(void *p,size_t s,size_t nm) { return 0; } | 34 | virtual size_t write(void* /* p */,size_t /* s */,size_t /* nm */) { return 0; } |
35 | CURLcode set_write(); | 35 | CURLcode set_write(); |
36 | 36 | ||
37 | virtual int progress(double dlt,double dln,double ult,double uln) { return 0; } | 37 | virtual int progress(double /* dlt */,double /* dln*/ ,double /* ult */,double /* uln */) { return 0; } |
38 | CURLcode set_progress(); | 38 | CURLcode set_progress(); |
39 | 39 | ||
40 | virtual size_t header(void *p,size_t s,size_t nm) { return s*nm; } | 40 | virtual size_t header(void* /* p */,size_t s,size_t nm) { return s*nm; } |
41 | CURLcode set_header(); | 41 | CURLcode set_header(); |
42 | }; | 42 | }; |
43 | 43 | ||
44 | } | 44 | } |
45 | 45 | ||
46 | } | 46 | } |
47 | 47 | ||
48 | #endif /* __OPKELE_CURL_H */ | 48 | #endif /* __OPKELE_CURL_H */ |
diff --git a/lib/util.cc b/lib/util.cc index eacf6d7..ac70938 100644 --- a/lib/util.cc +++ b/lib/util.cc | |||
@@ -207,17 +207,17 @@ namespace opkele { | |||
207 | char ic = uri[interesting]; | 207 | char ic = uri[interesting]; |
208 | if(ic==':') { | 208 | if(ic==':') { |
209 | string::size_type ni = uri.find_first_of("/#?%",interesting+1); | 209 | string::size_type ni = uri.find_first_of("/#?%",interesting+1); |
210 | const char *nptr = uri.data()+interesting+1; | 210 | const char *nptr = uri.data()+interesting+1; |
211 | char *eptr = 0; | 211 | char *eptr = 0; |
212 | long port = strtol(nptr,&eptr,10); | 212 | long port = strtol(nptr,&eptr,10); |
213 | if( (port>0) && (port<65535) && port!=(s?443:80) ) { | 213 | if( (port>0) && (port<65535) && port!=(s?443:80) ) { |
214 | char tmp[6]; | 214 | char tmp[6]; |
215 | snprintf(tmp,sizeof(tmp),"%d",port); | 215 | snprintf(tmp,sizeof(tmp),"%ld",port); |
216 | rv += ':'; rv += tmp; | 216 | rv += ':'; rv += tmp; |
217 | } | 217 | } |
218 | if(ni==string::npos) { | 218 | if(ni==string::npos) { |
219 | rv += '/'; return rv; | 219 | rv += '/'; return rv; |
220 | } | 220 | } |
221 | interesting = ni; | 221 | interesting = ni; |
222 | }else if(ic!='/') { | 222 | }else if(ic!='/') { |
223 | rv += '/'; rv += ic; | 223 | rv += '/'; rv += ic; |