summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2007-11-28 16:27:46 (UTC)
committer Michael Krelin <hacker@klever.net>2007-11-28 16:27:46 (UTC)
commit7ddb513bec854479fc9efb2a79044a978055d800 (patch) (side-by-side diff)
tree741c1810ac66e8b1b5ed879b39757d691c5988b4
parentbce90cb3dc7f013ed25b5a4e4ba848815f497066 (diff)
downloadlibopkele-7ddb513bec854479fc9efb2a79044a978055d800.zip
libopkele-7ddb513bec854479fc9efb2a79044a978055d800.tar.gz
libopkele-7ddb513bec854479fc9efb2a79044a978055d800.tar.bz2
keep keeping compilers happy
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--include/opkele/curl.h6
-rw-r--r--lib/util.cc2
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
@@ -22,27 +22,27 @@ namespace opkele {
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; }
+ 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; }
+ 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; }
+ virtual size_t header(void* /* p */,size_t s,size_t nm) { return s*nm; }
CURLcode set_header();
};
}
}
#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
@@ -203,25 +203,25 @@ namespace opkele {
transform(
uri.begin()+colon+3,uri.begin()+interesting,
back_inserter(rv), ::tolower );
bool qf = false;
char ic = uri[interesting];
if(ic==':') {
string::size_type ni = uri.find_first_of("/#?%",interesting+1);
const char *nptr = uri.data()+interesting+1;
char *eptr = 0;
long port = strtol(nptr,&eptr,10);
if( (port>0) && (port<65535) && port!=(s?443:80) ) {
char tmp[6];
- snprintf(tmp,sizeof(tmp),"%d",port);
+ snprintf(tmp,sizeof(tmp),"%ld",port);
rv += ':'; rv += tmp;
}
if(ni==string::npos) {
rv += '/'; return rv;
}
interesting = ni;
}else if(ic!='/') {
rv += '/'; rv += ic;
qf = true;
++interesting;
}
string::size_type n = interesting;