minor fixes and making compiler a bit happier

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

1 files changed, 8 insertions, 8 deletions

diff --git a/test/OP.cc b/test/OP.cc
index 851d831..6012b2e 100644
--- a/test/OP.cc
+++ b/test/OP.cc
@@ -56,14 +56,14 @@ class example_op_t : public opkele::verify_OP {
     public:
 	kingate::cgi_gateway& gw;
 	opdb_t db;
 	kingate::cookie htc;
 
 
-	example_op_t(kingate::cgi_gateway& gw)
-	: gw(gw) {
+	example_op_t(kingate::cgi_gateway& g)
+	: gw(g) {
 	    try {
 		htc = gw.cookies.get_cookie("htop_session");
 		sqlite3_mem_t<char*> S = sqlite3_mprintf(
 			"SELECT 1 FROM ht_sessions WHERE hts_id=%Q",
 			htc.get_value().c_str());
 		sqlite3_table_t T; int nr,nc;
@@ -197,13 +197,13 @@ class example_op_t : public opkele::verify_OP {
 	const string get_op_endpoint() const {
 	    return get_self_url(gw);
 	}
 
 };
 
-int main(int argc,char *argv[]) {
+int main(int,char **) {
     try {
 	kingate::plaincgi_interface ci;
 	kingate::cgi_gateway gw(ci);
 	string op;
 	try { op = gw.get_param("op"); }catch(kingate::exception_notfound&) { }
 	string message;
@@ -241,14 +241,14 @@ int main(int argc,char *argv[]) {
 	}else if(op=="logout") {
 	    example_op_t OP(gw);
 	    OP.set_authorized(false);
 	    op.clear();
 	    message = "logged out";
 	}
-	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") {
 	    cout <<
 		"Content-type: application/xrds+xml\n\n"
 		"<?xml version='1.0' encoding='utf-8'?>"
 		"<xrds:XRDS xmlns:xrds='xri://$xrds' xmlns='xri://$xrd*($v*2.0)'>"
 		 "<XRD>"
@@ -292,20 +292,20 @@ int main(int argc,char *argv[]) {
 		cout <<
 		    "Status: 302 Going back to RP with cancel\n"
 		    "Location: " << OP.cancel(om).append_query(OP.get_return_to())
 		    << "\n\n";
 	    }
 	    om.to_keyvalues(clog);
-	}else if(om=="associate") {
+	}else if(omode=="associate") {
 	    kingate_openid_message_t inm(gw);
 	    opkele::openid_message_t oum;
 	    example_op_t OP(gw);
 	    OP.associate(oum,inm);
 	    cout << "Content-type: text/plain\n\n";
 	    oum.to_keyvalues(cout);
-	}else if(om=="checkid_setup") {
+	}else if(omode=="checkid_setup") {
 	    kingate_openid_message_t inm(gw);
 	    example_op_t OP(gw);
 	    OP.checkid_(inm,0);
 	    OP.cookie_header(cout) <<
 		"Content-type: text/html\n"
 		"\n"
@@ -333,13 +333,13 @@ int main(int argc,char *argv[]) {
 		   " value='" << opkele::util::attr_escape(OP.htc.get_value()) << "'/>"
 		  "<input type='submit' name='op' value='id_res'/>"
 		  "<input type='submit' name='op' value='cancel'/>"
 		  "</form>"
 		 "</body>"
 		"</html>";
-	}else if(om=="check_authentication") {
+	}else if(omode=="check_authentication") {
 	    kingate_openid_message_t inm(gw);
 	    example_op_t OP(gw);
 	    opkele::openid_message_t oum;
 	    OP.check_authentication(oum,inm);
 	    cout << "Content-type: text/plain\n\n";
 	    oum.to_keyvalues(cout);