made gcc 4.3 a bit happier

Signed-off-by: Michael Krelin <hacker@klever.net>

5 files changed, 9 insertions, 9 deletions

diff --git a/lib/discovery.cc b/lib/discovery.cc
index d1989ec..984e308 100644
--- a/lib/discovery.cc
+++ b/lib/discovery.cc
@@ -336,13 +336,13 @@ namespace opkele {
 		if(space && ( (!colon) || space<colon ) ) {
 		    xrds_location.clear(); http_content_type.clear();
 		}else if(colon) {
 		    const char *hv = ++colon;
 		    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) {
 			if( (hnl>=sizeof(XRDS_HEADER))
 				&& !strncasecmp(h,XRDS_HEADER":",
 				    sizeof(XRDS_HEADER)) ) {
 			    xrds_location.assign(hv,rb);
@@ -497,13 +497,13 @@ namespace opkele {
 		    string href;
 		    for(;*a;a+=2) {
 			if( !strcasecmp(a[0],"rel") ) {
 			    rels.assign(a[1]);
 			}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);
 			    href.erase(lns+1);
 			}
 		    }
 		    for(string::size_type ns=rels.find_first_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
@@ -155,13 +155,13 @@ namespace opkele {
 	    return pfx;
 	if(has_ns(uri))
 	    throw bad_input(OPKELE_CP_ "OpenID message already contains namespace");
 	string rv = pfx;
 	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");
 	}
 	set_field("ns."+rv,uri);
 	return rv;
     }
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
@@ -39,15 +39,15 @@ namespace opkele {
 	    }
 
 	    OP_verifier& operator++() { return *this; }
 	    OP_verifier& operator++(int) { return *this; }
     };
 
-    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");
 	}catch(__OP_verifier_good_input& ovgi) {
 	}
     }
 
diff --git a/lib/secret.cc b/lib/secret.cc
index d538890..3f1e39c 100644
--- a/lib/secret.cc
+++ b/lib/secret.cc
@@ -7,13 +7,13 @@
 namespace opkele {
     using namespace std;
 
     template<class __a1,class __a2,class __r>
 	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);
 	    }
 	};
 
     void secret_t::enxor_to_base64(const unsigned char *key_d,string& rv) const {
 	vector<unsigned char> tmp;
 	transform(
diff --git a/lib/util.cc b/lib/util.cc
index b702291..d979502 100644
--- a/lib/util.cc
+++ b/lib/util.cc
@@ -208,13 +208,13 @@ namespace opkele {
 			tmp[0] = *(i++);
 			if(i==ie)
 			    throw failed_conversion(OPKELE_CP_ "not enough hexadecimals after the percent sign in url-encoded string");
 			tmp[1] = *i;
 			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:
 			*(ii++) = *i; break;
 		}
 	    }
 	    return rv;
@@ -345,16 +345,16 @@ namespace opkele {
 		     tmp[0] = uri[n++];
 		     tmp[1] = uri[n++];
 		     if(!( isxdigit(tmp[0]) && isxdigit(tmp[1]) ))
 			 throw bad_input(OPKELE_CP_ "Invalid percent-encoded character in URI being normalized");
 		     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) {
 		     rv += pseg; rv += c;
 		     pseg.clear();
 		 }else if(n>=ul || strchr("?/#",c)) {
 		     if(pseg.empty() || pseg==".") {