minor fixes and making compiler a bit happier

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

9 files changed, 44 insertions, 46 deletions

diff --git a/lib/basic_op.cc b/lib/basic_op.cc
index 18446dc..2d82147 100644
--- a/lib/basic_op.cc
+++ b/lib/basic_op.cc
@@ -68,5 +68,2 @@ namespace opkele {
 	size_t d_len = 0;
-	enum {
-	    sess_cleartext, sess_dh_sha1, sess_dh_sha256
-	} st = sess_cleartext;
 	string sts = inm.get_field("session_type");
@@ -100,7 +97,7 @@ namespace opkele {
 	    throw unsupported(OPKELE_CP_ "Unsupported session_type");
-	assoc_t assoc;
+	assoc_t a;
 	if(ats=="HMAC-SHA1")
-	    assoc = alloc_assoc(ats,SHA_DIGEST_LENGTH,true);
+	    a = alloc_assoc(ats,SHA_DIGEST_LENGTH,true);
 	else if(ats=="HMAC-SHA256")
-	    assoc = alloc_assoc(ats,SHA256_DIGEST_LENGTH,true);
+	    a = alloc_assoc(ats,SHA256_DIGEST_LENGTH,true);
 	else
@@ -109,6 +106,6 @@ namespace opkele {
 	oum.set_field("ns",OIURI_OPENID20);
-	oum.set_field("assoc_type",assoc->assoc_type());
-	oum.set_field("assoc_handle",assoc->handle());
+	oum.set_field("assoc_type",a->assoc_type());
+	oum.set_field("assoc_handle",a->handle());
 	oum.set_field("expires_in",util::long_to_string(assoc->expires_in()));
-	secret_t secret = assoc->secret();
+	secret_t secret = a->secret();
 	if(sts=="DH-SHA1" || sts=="DH-SHA256") {
@@ -136,6 +133,6 @@ namespace opkele {
 	reset_vars();
-	string mode = inm.get_field("mode");
-	if(mode=="checkid_setup")
+	string modestr = inm.get_field("mode");
+	if(modestr=="checkid_setup")
 	    mode = mode_checkid_setup;
-	else if(mode=="checkid_immediate")
+	else if(modestr=="checkid_immediate")
 	    mode = mode_checkid_immediate;
@@ -240,3 +237,3 @@ namespace opkele {
     basic_openid_message& basic_OP::error(basic_openid_message& om,
-	    const string& error,const string& contact,
+	    const string& err,const string& contact,
 	    const string& reference ) {
@@ -245,5 +242,5 @@ namespace opkele {
 	om.set_field("mode","error");
-	om.set_field("error",error);
-	om.set_field("contact",contact);
-	om.set_field("reference",reference);
+	om.set_field("error",err);
+	if(!contact.empty()) om.set_field("contact",contact);
+	if(!reference.empty()) om.set_field("reference",reference);
 	return om;
diff --git a/lib/basic_rp.cc b/lib/basic_rp.cc
index bd45d99..a0ad130 100644
--- a/lib/basic_rp.cc
+++ b/lib/basic_rp.cc
@@ -1 +1,2 @@
+#include <cassert>
 #include <openssl/sha.h>
@@ -27,3 +28,4 @@ namespace opkele {
 	    (*(--ckptr))=0; ++cklen; }
-	unsigned char key_digest[d_len];
+	assert(d_len<=SHA256_DIGEST_LENGTH);
+	unsigned char key_digest[SHA256_DIGEST_LENGTH];
 	secret.enxor_from_base64((*d_fun)(ckptr,cklen,key_digest),om.get_field("enc_mac_key"));
@@ -80,3 +82,3 @@ namespace opkele {
 	    expires_in = util::string_to_long(res.get_field("expires_in"));
-	}catch(exception& e) {
+	}catch(exception&) {
 	    try {
@@ -89,3 +91,3 @@ namespace opkele {
 		expires_in = util::string_to_long(res.get_field("expires_in"));
-	    }catch(bad_input& e) {
+	    }catch(bad_input&) {
 		throw dumb_RP(OPKELE_CP_ "OP failed to supply an association");
@@ -236,3 +238,3 @@ namespace opkele {
 		"claimed_id", "identity" };
-	    for(int ms=0;ms<(sizeof(mustsign)/sizeof(*mustsign));++ms) {
+	    for(size_t ms=0;ms<(sizeof(mustsign)/sizeof(*mustsign));++ms) {
 		if(om.has_field(mustsign[ms]) && !signeds.has_field(mustsign[ms]))
diff --git a/lib/discovery.cc b/lib/discovery.cc
index 6f58339..6f9926c 100644
--- a/lib/discovery.cc
+++ b/lib/discovery.cc
@@ -332,3 +332,3 @@ namespace opkele {
 		    const char *hv = ++colon;
-		    int hnl = colon-h;
+		    size_t hnl = colon-h;
 		    int rb;
diff --git a/lib/expat.cc b/lib/expat.cc
index fa6fdde..c4dab7e 100644
--- a/lib/expat.cc
+++ b/lib/expat.cc
@@ -15,2 +15,3 @@ namespace opkele {
 	    _x = x;
+	    return *this;
 	}
diff --git a/lib/extension.cc b/lib/extension.cc
index f7aaea5..0f121ca 100644
--- a/lib/extension.cc
+++ b/lib/extension.cc
@@ -13,3 +13,3 @@ namespace opkele {
 	throw not_implemented(OPKELE_CP_ "OP checkid_* hook not implemented"); }
-    void extension_t::op_id_res_hook(basic_openid_message& om) {
+    void extension_t::op_id_res_hook(basic_openid_message&) {
 	throw not_implemented(OPKELE_CP_ "OP id_res hook not implemented"); }
diff --git a/lib/openid_message.cc b/lib/openid_message.cc
index fdb4b04..521ea85 100644
--- a/lib/openid_message.cc
+++ b/lib/openid_message.cc
@@ -17,4 +17,4 @@ namespace opkele {
 
-	    __om_copier(basic_openid_message& to,const basic_openid_message& from)
-		: from(from), to(to) {
+	    __om_copier(basic_openid_message& t,const basic_openid_message& f)
+		: from(f), to(t) {
 		    to.reset_fields();
@@ -39,4 +39,4 @@ namespace opkele {
 
-	    __om_ns_finder(const basic_openid_message& om,
-		    const string& uri) : om(om), uri(uri) { }
+	    __om_ns_finder(const basic_openid_message& m,
+		    const string& u) : om(m), uri(u) { }
 
@@ -67,12 +67,12 @@ namespace opkele {
 	    const basic_openid_message& om;
-	    string& rv;
 	    bool first;
+	    string& rv;
 
-	    __om_query_builder(string& rv,const basic_openid_message& om)
-		: om(om), first(true), rv(rv) {
+	    __om_query_builder(string& r,const basic_openid_message& m)
+		: om(m), first(true), rv(r) {
 		    for_each(om.fields_begin(),om.fields_end(),*this);
 		}
-	    __om_query_builder(string& rv,const basic_openid_message& om,const string& url)
-		: om(om), first(true), rv(rv) {
-		    rv = url;
+	    __om_query_builder(string& r,const basic_openid_message& m,const string& u)
+		: om(m), first(true), rv(r) {
+		    rv = u;
 		    if(rv.find('?')==string::npos)
@@ -107,6 +107,6 @@ namespace opkele {
     }
-    void basic_openid_message::set_field(const string& n,const string& v) {
+    void basic_openid_message::set_field(const string&,const string&) {
 	throw not_implemented(OPKELE_CP_ "set_field() not implemented");
     }
-    void basic_openid_message::reset_field(const string& n) {
+    void basic_openid_message::reset_field(const string&) {
 	throw not_implemented(OPKELE_CP_ "reset_field() not implemented");
@@ -149,4 +149,4 @@ namespace opkele {
 
-	    __om_kv_outputter(const basic_openid_message& om,ostream& os)
-		: om(om), os(os) { }
+	    __om_kv_outputter(const basic_openid_message& m,ostream& s)
+		: om(m), os(s) { }
 
@@ -166,4 +166,4 @@ namespace opkele {
 
-	    __om_html_outputter(const basic_openid_message& om,ostream& os)
-		: om(om), os(os) { }
+	    __om_html_outputter(const basic_openid_message& m,ostream& s)
+		: om(m), os(s) { }
 
diff --git a/lib/prequeue_rp.cc b/lib/prequeue_rp.cc
index e242f87..3aa960f 100644
--- a/lib/prequeue_rp.cc
+++ b/lib/prequeue_rp.cc
@@ -57,3 +57,3 @@ namespace opkele {
 
-	    endpoint_queuer(prequeue_RP& rp) : rp(rp) { }
+	    endpoint_queuer(prequeue_RP& r) : rp(r) { }
 
@@ -73,3 +73,3 @@ namespace opkele {
 
-    void prequeue_RP::set_normalized_id(const string& nid) {
+    void prequeue_RP::set_normalized_id(const string&) {
     }
diff --git a/lib/sreg.cc b/lib/sreg.cc
index b40cd45..0bd4d2e 100644
--- a/lib/sreg.cc
+++ b/lib/sreg.cc
@@ -57,8 +57,6 @@ namespace opkele {
 	    pfx = om.find_ns(OIURI_SREG11,"sreg");
-	}catch(failed_lookup& fl) {
+	}catch(failed_lookup&) {
 	    try {
 		pfx = om.find_ns(OIURI_SREG10,"sreg");
-	    }catch(failed_lookup& fl) {
-		return;
-	    }
+	    }catch(failed_lookup&) { return; }
 	}
diff --git a/lib/verify_op.cc b/lib/verify_op.cc
index ab21b4f..c493c12 100644
--- a/lib/verify_op.cc
+++ b/lib/verify_op.cc
@@ -17,4 +17,4 @@ namespace opkele {
 	public:
-	    int seen;
 	    const string& return_to;
+	    int seen;
 
@@ -31,3 +31,3 @@ namespace opkele {
 	    RP_verifier& operator++() { ++seen; return *this; }
-	    RP_verifier& operator++(int) { +seen; return *this; }
+	    RP_verifier& operator++(int) { ++seen; return *this; }
     };