summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--include/opkele/iterator.h4
-rw-r--r--lib/discovery.cc4
-rw-r--r--lib/message.cc2
-rw-r--r--lib/prequeue_rp.cc4
-rw-r--r--lib/secret.cc2
-rw-r--r--lib/util.cc6
6 files changed, 11 insertions, 11 deletions
diff --git a/include/opkele/iterator.h b/include/opkele/iterator.h
index 28c1c83..8f86234 100644
--- a/include/opkele/iterator.h
+++ b/include/opkele/iterator.h
@@ -156,5 +156,5 @@ namespace opkele {
basic_filterator<IT>& operator++() {
bool found = false;
- for(++it;!(it==ei || (found=is_interesting()));++it);
+ for(++it;!(it==ei || (found=is_interesting()));++it) ;
if(!found) empty=true;
return *this;
@@ -168,5 +168,5 @@ namespace opkele {
void prepare() {
bool found = false;
- for(;!(it==ei || (found=is_interesting()));++it);
+ for(;!(it==ei || (found=is_interesting()));++it) ;
if(!found) empty = true;
}
diff --git a/lib/discovery.cc b/lib/discovery.cc
index d1989ec..984e308 100644
--- a/lib/discovery.cc
+++ b/lib/discovery.cc
@@ -340,5 +340,5 @@ namespace opkele {
size_t hnl = colon-h;
int rb;
- for(rb = bytes-hnl-1;rb>0 && isspace(*hv);++hv,--rb);
+ for(rb = bytes-hnl-1;rb>0 && isspace(*hv);++hv,--rb) ;
while(rb>0 && isspace(hv[rb-1])) --rb;
if(rb) {
@@ -501,5 +501,5 @@ namespace opkele {
}else if( !strcasecmp(a[0],"href") ) {
const char *ns = a[1];
- for(;*ns && isspace(*ns);++ns);
+ for(;*ns && isspace(*ns);++ns) ;
href.assign(ns);
string::size_type lns=href.find_last_not_of(data::_whitespace_chars);
diff --git a/lib/message.cc b/lib/message.cc
index 524946a..c1f8088 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -159,5 +159,5 @@ namespace opkele {
if(has_field("ns."+rv)) {
string::reference c=rv[rv.length()];
- for(c='a';c<='z' && has_field("ns."+rv);++c);
+ for(c='a';c<='z' && has_field("ns."+rv);++c) ;
if(c=='z')
throw exception(OPKELE_CP_ "Failed to allocate namespace");
diff --git a/lib/prequeue_rp.cc b/lib/prequeue_rp.cc
index e499d08..886efae 100644
--- a/lib/prequeue_rp.cc
+++ b/lib/prequeue_rp.cc
@@ -43,7 +43,7 @@ namespace opkele {
};
- void prequeue_RP::verify_OP(const string& OP,const string& claimed_id,const string& id) const {
+ void prequeue_RP::verify_OP(const string& OP,const string& _claimed_id,const string& id) const {
try {
- discover(OP_verifier(OP,id),claimed_id);
+ discover(OP_verifier(OP,id),_claimed_id);
throw id_res_unauthorized(OPKELE_CP_
"OP is not authorized to make an assertion regarding the identity");
diff --git a/lib/secret.cc b/lib/secret.cc
index d538890..3f1e39c 100644
--- a/lib/secret.cc
+++ b/lib/secret.cc
@@ -11,5 +11,5 @@ namespace opkele {
struct bitwise_xor : public binary_function<__a1,__a2,__r> {
__r operator() (const __a1& a1,const __a2& a2) const {
- return a1^a2;
+ return (__r)(a1^a2);
}
};
diff --git a/lib/util.cc b/lib/util.cc
index b702291..d979502 100644
--- a/lib/util.cc
+++ b/lib/util.cc
@@ -212,5 +212,5 @@ namespace opkele {
if(!(isxdigit(tmp[0]) && isxdigit(tmp[1])))
throw failed_conversion(OPKELE_CP_ "non-hex follows percent in url-encoded string");
- *(ii++) = strtol(tmp,0,16);
+ *(ii++) = (char)strtol(tmp,0,16);
break;
default:
@@ -349,8 +349,8 @@ namespace opkele {
int cc = strtol(tmp,0,16);
if( isalpha(cc) || isdigit(cc) || strchr("._~-",cc) )
- pseg += cc;
+ pseg += (char)cc;
else{
pseg += '%';
- pseg += toupper(tmp[0]); pseg += toupper(tmp[1]);
+ pseg += (char)toupper(tmp[0]); pseg += (char)toupper(tmp[1]);
}
}else if(qf) {