minor fixes and making compiler a bit happier

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

16 files changed, 77 insertions, 77 deletions

diff --git a/include/opkele/basic_op.h b/include/opkele/basic_op.h
index 0326508..12306dd 100644
--- a/include/opkele/basic_op.h
+++ b/include/opkele/basic_op.h
@@ -48,2 +48,4 @@ namespace opkele {
 
+            virtual ~basic_OP() { }
+
             void reset_vars();
diff --git a/include/opkele/expat.h b/include/opkele/expat.h
index 60c41ac..3ab1630 100644
--- a/include/opkele/expat.h
+++ b/include/opkele/expat.h
@@ -28,13 +28,13 @@ namespace opkele {
 
-                virtual void start_element(const XML_Char *n,const XML_Char **a) { }
-                virtual void end_element(const XML_Char *n) { }
+                virtual void start_element(const XML_Char * /* n */,const XML_Char ** /* a */) { }
+                virtual void end_element(const XML_Char * /* n */) { }
                 void set_element_handler();
 
-                virtual void character_data(const XML_Char *s,int l) { }
+                virtual void character_data(const XML_Char * /* s */,int /* l */) { }
                 void set_character_data_handler();
 
-                virtual void processing_instruction(const XML_Char *t,const XML_Char *d) { }
+                virtual void processing_instruction(const XML_Char * /* t */,const XML_Char * /* d */) { }
                 void set_processing_instruction_handler();
 
-                virtual void comment(const XML_Char *d) { }
+                virtual void comment(const XML_Char * /* d */) { }
                 void set_comment_handler();
@@ -45,3 +45,3 @@ namespace opkele {
 
-                virtual void default_handler(const XML_Char *s,int l) { }
+                virtual void default_handler(const XML_Char * /* s */,int /* l */) { }
                 void set_default_handler();
@@ -49,4 +49,4 @@ namespace opkele {
 
-                virtual void start_namespace_decl(const XML_Char *p,const XML_Char *u) { }
-                virtual void end_namespace_decl(const XML_Char *p) { }
+                virtual void start_namespace_decl(const XML_Char * /* p */,const XML_Char * /* u */) { }
+                virtual void end_namespace_decl(const XML_Char * /* p */) { }
                 void set_namespace_decl_handler();
diff --git a/include/opkele/iterator.h b/include/opkele/iterator.h
index 812a786..28c1c83 100644
--- a/include/opkele/iterator.h
+++ b/include/opkele/iterator.h
@@ -28,3 +28,3 @@ namespace opkele {
 
-                output_iterator_proxy_impl(const IT& i) : i(i) { }
+                output_iterator_proxy_impl(const IT& _i) : i(_i) { }
                 basic_output_iterator_proxy_impl<T>* dup() const {
@@ -32,4 +32,3 @@ namespace opkele {
                 basic_output_iterator_proxy_impl<T>& operator=(const T& x) {
-                    (*i) = x;
-                }
+                    (*i) = x; return *this; }
         };
@@ -53,3 +52,3 @@ namespace opkele {
                 output_iterator_proxy& operator=(const T& x) {
-                    (**I) = x; }
+                    (**I) = x; return *this; }
 
@@ -79,3 +78,3 @@ namespace opkele {
 
-                forward_iterator_proxy_impl(const IT& i) : i(i) { }
+                forward_iterator_proxy_impl(const IT& _i) : i(_i) { }
 
@@ -138,4 +137,4 @@ namespace opkele {
                     basic_filterator() : empty(true) { }
-                    basic_filterator(const IT& bi,const IT& ei)
-                        : it(bi), ei(ei) { empty = (bi==ei); }
+                    basic_filterator(const IT& _bi,const IT& _ei)
+                        : it(_bi), ei(_ei) { empty = (it==ei); }
                     basic_filterator(const basic_filterator<IT>& x)
@@ -187,5 +186,5 @@ namespace opkele {
                     map_keys_iterator() : empty(true) { }
-                    map_keys_iterator(const IT& bi,
-                            const IT& ei)
-                        : it(bi), ei(ei) { empty = (bi==ei); }
+                    map_keys_iterator(const IT& _bi,
+                            const IT& _ei)
+                        : it(_bi), ei(_ei) { empty = (it==ei); }
                     map_keys_iterator(const self_type& x)
diff --git a/include/opkele/types.h b/include/opkele/types.h
index 6ab51ef..a3b657d 100644
--- a/include/opkele/types.h
+++ b/include/opkele/types.h
@@ -128,2 +128,3 @@ namespace opkele {
             basic_openid_message() { }
+            virtual ~basic_openid_message() { }
             basic_openid_message(const basic_openid_message& x);
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; }
     };
diff --git a/test/OP.cc b/test/OP.cc
index 851d831..6012b2e 100644
--- a/test/OP.cc
+++ b/test/OP.cc
@@ -61,4 +61,4 @@ class example_op_t : public opkele::verify_OP {
 
-        example_op_t(kingate::cgi_gateway& gw)
-        : gw(gw) {
+        example_op_t(kingate::cgi_gateway& g)
+        : gw(g) {
             try {
@@ -202,3 +202,3 @@ class example_op_t : public opkele::verify_OP {
 
-int main(int argc,char *argv[]) {
+int main(int,char **) {
     try {
@@ -246,4 +246,4 @@ int main(int argc,char *argv[]) {
         }
-        string om;
-        try { om = gw.get_param("openid.mode"); }catch(kingate::exception_notfound&) { }
+        string omode;
+        try { omode = gw.get_param("openid.mode"); }catch(kingate::exception_notfound&) { }
         if(op=="xrds") {
@@ -297,3 +297,3 @@ int main(int argc,char *argv[]) {
             om.to_keyvalues(clog);
-        }else if(om=="associate") {
+        }else if(omode=="associate") {
             kingate_openid_message_t inm(gw);
@@ -304,3 +304,3 @@ int main(int argc,char *argv[]) {
             oum.to_keyvalues(cout);
-        }else if(om=="checkid_setup") {
+        }else if(omode=="checkid_setup") {
             kingate_openid_message_t inm(gw);
@@ -338,3 +338,3 @@ int main(int argc,char *argv[]) {
                 "</html>";
-        }else if(om=="check_authentication") {
+        }else if(omode=="check_authentication") {
             kingate_openid_message_t inm(gw);
diff --git a/test/RP.cc b/test/RP.cc
index e9744a4..99a792c 100644
--- a/test/RP.cc
+++ b/test/RP.cc
@@ -60,4 +60,4 @@ class example_rp_t : public opkele::prequeue_RP {
 
-        example_rp_t(kingate::cgi_gateway& gw)
-        : ordinal(0), have_eqtop(false), gw(gw), as_id(-1) {
+        example_rp_t(kingate::cgi_gateway& g)
+        : as_id(-1), ordinal(0), gw(g), have_eqtop(false)  {
             try {
@@ -353,3 +353,3 @@ class example_rp_t : public opkele::prequeue_RP {
 
-int main(int argc,char *argv[]) {
+int main(int,char **) {
     try {
diff --git a/test/kingate_openid_message.h b/test/kingate_openid_message.h
index 37dcdfa..7029ff7 100644
--- a/test/kingate_openid_message.h
+++ b/test/kingate_openid_message.h
@@ -59,4 +59,4 @@ class cut_prefix_filterator : public opkele::util::basic_filterator<IT> {
         cut_prefix_filterator() { }
-        cut_prefix_filterator(const IT& bi,const IT&ei,const string& pfx)
-            : opkele::util::basic_filterator<IT>(bi,ei), pfx(pfx) {
+        cut_prefix_filterator(const IT& _bi,const IT&_ei,const string& p)
+            : opkele::util::basic_filterator<IT>(_bi,_ei), pfx(p) {
                 this->prepare();