From 16667a21c3052c89218d3e56098f0fc29dca2f1a Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Fri, 08 Feb 2008 22:16:15 +0000
Subject: minor fixes and making compiler a bit happier

Signed-off-by: Michael Krelin <hacker@klever.net>
---
(limited to 'test')

diff --git a/test/OP.cc b/test/OP.cc
index 851d831..6012b2e 100644
--- a/test/OP.cc
+++ b/test/OP.cc
@@ -59,8 +59,8 @@ class example_op_t : public opkele::verify_OP {
 	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(
@@ -200,7 +200,7 @@ class example_op_t : public opkele::verify_OP {
 
 };
 
-int main(int argc,char *argv[]) {
+int main(int,char **) {
     try {
 	kingate::plaincgi_interface ci;
 	kingate::cgi_gateway gw(ci);
@@ -244,8 +244,8 @@ int main(int argc,char *argv[]) {
 	    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"
@@ -295,14 +295,14 @@ int main(int argc,char *argv[]) {
 		    << "\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);
@@ -336,7 +336,7 @@ int main(int argc,char *argv[]) {
 		  "</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;
diff --git a/test/RP.cc b/test/RP.cc
index e9744a4..99a792c 100644
--- a/test/RP.cc
+++ b/test/RP.cc
@@ -58,8 +58,8 @@ class example_rp_t : public opkele::prequeue_RP {
 	int ordinal;
 	kingate::cgi_gateway& gw;
 
-	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 {
 		htc = gw.cookies.get_cookie("ht_session");
 		as_id = opkele::util::string_to_long(gw.get_param("asid"));
@@ -351,7 +351,7 @@ class example_rp_t : public opkele::prequeue_RP {
 #endif
 };
 
-int main(int argc,char *argv[]) {
+int main(int,char **) {
     try {
 	kingate::plaincgi_interface ci;
 	kingate::cgi_gateway gw(ci);
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
@@ -57,8 +57,8 @@ class cut_prefix_filterator : public opkele::util::basic_filterator<IT> {
 	mutable string tmp;
 
 	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();
 	    }
 
--
cgit v0.9.0.2