further calming compiler down

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

4 files changed, 10 insertions, 10 deletions

diff --git a/lib/consumer.cc b/lib/consumer.cc
index d578546..7881f5f 100644
--- a/lib/consumer.cc
+++ b/lib/consumer.cc
@@ -356,49 +356,49 @@ namespace opkele {
 		}else{
 		    rel.assign(rels,ns,s-ns);
 		    ns=s;
 		}
 		if(rel=="openid.server") {
 		    server.assign(attrs,m2.begin(1),m2.length(1));
 		    if(!delegate.empty()) {
 			gotit = true;
 			break;
 		    }
 		}else if(rel=="openid.delegate") {
 		    delegate.assign(attrs,m2.begin(1),m2.length(1));
 		    if(!server.empty()) {
 			gotit = true;
 			break;
 		    }
 		}
 		if(ns==string::npos) break;
 	    }
 	}
 	if(server.empty())
 	    throw failed_assertion(OPKELE_CP_ "The location has no openid.server declaration");
     }
 
-    assoc_t consumer_t::find_assoc(const string& server) {
+    assoc_t consumer_t::find_assoc(const string& /* server */) {
 	throw failed_lookup(OPKELE_CP_ "no find_assoc() provided");
     }
 
     string consumer_t::normalize(const string& url) {
 	string rv = url;
 	// strip leading and trailing spaces
 	string::size_type i = rv.find_first_not_of(" \t\r\n");
 	if(i==string::npos)
 	    throw bad_input(OPKELE_CP_ "empty URL");
 	if(i)
 	    rv.erase(0,i);
 	i = rv.find_last_not_of(" \t\r\n");
 	assert(i!=string::npos);
 	if(i<(rv.length()-1))
 	    rv.erase(i+1);
 	// add missing http://
 	i = rv.find("://");
 	if(i==string::npos) { // primitive. but do we need more?
 	    rv.insert(0,"http://");
 	    i = sizeof("http://")-1;
 	}else{
 	    i += sizeof("://")-1;
 	}
 	string::size_type qm = rv.find('?',i);
diff --git a/lib/extension.cc b/lib/extension.cc
index 44cf0cb..8f22562 100644
--- a/lib/extension.cc
+++ b/lib/extension.cc
@@ -1,15 +1,15 @@
 #include <opkele/exception.h>
 #include <opkele/extension.h>
 
 namespace opkele {
 
-    void extension_t::checkid_hook(params_t& p,const string& identity) {
+    void extension_t::checkid_hook(params_t& /* p */,const string& /* identity */ ) {
 	throw not_implemented(OPKELE_CP_ "Consumer checkid_hook not implemented");
     }
-    void extension_t::id_res_hook(const params_t& p,const params_t& sp,const string& identity) {
+    void extension_t::id_res_hook(const params_t& /* p */,const params_t& /* sp */,const string& /* identity */) {
 	throw not_implemented(OPKELE_CP_ "Consumer id_res_hook not implemented");
     }
-    void extension_t::checkid_hook(const params_t& pin,params_t& pout) {
+    void extension_t::checkid_hook(const params_t& /* pin */,params_t& /* pout */) {
 	throw not_implemented(OPKELE_CP_ "Server checkid_hook not implemented");
     }
 }
diff --git a/lib/sreg.cc b/lib/sreg.cc
index 08e66b7..60dc691 100644
--- a/lib/sreg.cc
+++ b/lib/sreg.cc
@@ -6,66 +6,66 @@ namespace opkele {
     using std::find;
 
     static const struct _sreg_field {
 	const char *fieldname;
 	sreg_t::fieldbit_t fieldbit;
     }	fields[] = {
 	{ "nickname", sreg_t::field_nickname },
 	{ "email", sreg_t::field_email },
 	{ "fullname", sreg_t::field_fullname },
 	{ "dob", sreg_t::field_dob },
 	{ "gender", sreg_t::field_gender },
 	{ "postcode", sreg_t::field_postcode },
 	{ "country", sreg_t::field_country },
 	{ "language", sreg_t::field_language },
 	{ "timezone", sreg_t::field_timezone }
     };
 #   define fields_BEGIN	fields
 #   define fields_END &fields[sizeof(fields)/sizeof(*fields)]
     typedef const struct _sreg_field *fields_iterator;
 
     bool operator==(const struct _sreg_field& fd,const string& fn) {
 	return fd.fieldname==fn;
     }
 
-    void sreg_t::checkid_hook(params_t& p,const string& identity) {
+    void sreg_t::checkid_hook(params_t& p,const string& /* identity */) {
 	string fr, fo;
 	for(fields_iterator f=fields_BEGIN;f<fields_END;++f) {
 	    if(f->fieldbit&fields_required) {
 		if(!fr.empty()) fr+=",";
 		fr += f->fieldname;
 	    }
 	    if(f->fieldbit&fields_optional) {
 		if(!fo.empty()) fo+=",";
 		fo += f->fieldname;
 	    }
 	}
 	if(!fr.empty()) p["sreg.required"]=fr;
 	if(!fo.empty()) p["sreg.optional"]=fo;
 	if(!policy_url.empty()) p["sreg.policy_url"]=policy_url;
     }
 
-    void sreg_t::id_res_hook(const params_t& p,const params_t& sp,const string& identity) {
+    void sreg_t::id_res_hook(const params_t& /* p */,const params_t& sp,const string& /* identity */) {
 	clear();
 	for(fields_iterator f=fields_BEGIN;f<fields_END;++f) {
 	    string fn = "sreg."; fn+=f->fieldname;
 	    if(!sp.has_param(fn)) continue;
 	    has_fields |= f->fieldbit;
 	    response[f->fieldbit]=sp.get_param(fn);
 	}
     }
 
     const string& sreg_t::get_field(fieldbit_t fb) const {
 	response_t::const_iterator i = response.find(fb);
 	if(i==response.end())
 	    throw failed_lookup(OPKELE_CP_ "no field data available");
 	return i->second;
     }
 
     void sreg_t::set_field(fieldbit_t fb,const string& fv) {
 	response[fb] = fv;
 	has_fields |= fb;
     }
 
     void sreg_t::reset_field(fieldbit_t fb) {
 	has_fields &= ~fb;
 	response.erase(fb);
@@ -97,28 +97,28 @@ namespace opkele {
 	fields_response = 0;
 	try {
 	    string fl = pin.get_param("openid.sreg.required");
 	    fields_required = fields_list_to_bitmask(fl);
 	}catch(failed_lookup&) { }
 	try {
 	    string fl = pin.get_param("openid.sreg.optional");
 	    fields_optional = fields_list_to_bitmask(fl);
 	}catch(failed_lookup&) { }
 	try {
 	    policy_url = pin.get_param("openid.sreg.policy_url");
 	}catch(failed_lookup&) { }
         setup_response(pin,pout);
 	fields_response &= has_fields;
 	for(fields_iterator f=fields_BEGIN;f<fields_END;++f) {
 	    if(!(f->fieldbit&fields_response)) continue;
 	    if(!pout["signed"].empty())
 		pout["signed"] +=',';
 	    string pn = "sreg."; pn += f->fieldname;
 	    pout["signed"] += pn;
 	    pout[pn] = get_field(f->fieldbit);
 	}
     }
 
-    void sreg_t::setup_response(const params_t& pin,params_t& pout) {
+    void sreg_t::setup_response(const params_t& /* pin */,params_t& /* pout */) {
 	fields_response = (fields_required|fields_optional)&has_fields;
     }
 }
diff --git a/test/test.cc b/test/test.cc
index 0010f2b..f92284c 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -1,47 +1,47 @@
 #include <iostream>
 #include <stdexcept>
 using namespace std;
 #include <opkele/exception.h>
 #include <opkele/consumer.h>
 
 #include "config.h"
 
 class failed_test : public opkele::exception {
     public:
 	failed_test(OPKELE_E_PARS)
 	    : exception(OPKELE_E_CONS) { }
 };
 
 class dummy_consumer_t : public opkele::consumer_t {
     public:
-	virtual opkele::assoc_t store_assoc(const string& server,const string& handle,const opkele::secret_t& secret,int expires_in) {
+	virtual opkele::assoc_t store_assoc(const string& /* server */,const string& /* handle */,const opkele::secret_t& /* secret */,int /* expires_in */) {
 	    throw opkele::not_implemented(OPKELE_CP_ "Not implemented");
 	}
-	virtual opkele::assoc_t retrieve_assoc(const string& server,const string& handle) {
+	virtual opkele::assoc_t retrieve_assoc(const string& /* server */ ,const string& /* handle */) {
 	    throw opkele::not_implemented(OPKELE_CP_ "Not implemented");
 	}
-	virtual void invalidate_assoc(const string& server,const string& handle) {
+	virtual void invalidate_assoc(const string& /* server */,const string& /* handle */) {
 	    throw opkele::not_implemented(OPKELE_CP_ "Not implemented");
 	}
 };
 
 
 void test_retrieve_links(const string& f,bool success,const string& s="",const string& d="") {
     dummy_consumer_t dc;
     string server, delegate;
     try {
 	dc.retrieve_links("file://" OPKELE_SRC_DIR "/test/html/"+f,server,delegate);
 	if(!success)
 	    throw failed_test(OPKELE_CP_ "Retrieved links when it shouldn't");
 	if(server!=s)
 	    throw failed_test(OPKELE_CP_ "retrieve_links test failed, expected server '"+s+"', got '"+server+"'");
 	if(delegate!=d)
 	    throw failed_test(OPKELE_CP_ "retrieve_links test failed, expected delegate '"+d+"', got '"+delegate+"'");
     }catch(opkele::bad_input& obi) {
 	if(success)
 	    throw failed_test(OPKELE_CP_ "Test '"+f+"' failed due to 'bad_input'["+obi.what()+"]");
     }catch(opkele::failed_assertion& ofa) {
 	if(success)
 	    throw failed_test(OPKELE_CP_ "Test '"+f+"' failed due to 'failed_assertion'["+ofa.what()+"]");
     }
 }