1 files changed, 2 insertions, 4 deletions

diff --git a/lib/sreg.cc b/lib/sreg.cc
index b40cd45..0bd4d2e 100644
--- a/lib/sreg.cc
+++ b/lib/sreg.cc
@@ -26,70 +26,68 @@ namespace opkele {
 
     bool operator==(const struct _sreg_field& fd,const string& fn) {
 	return fd.fieldname==fn;
     }
 
     void sreg_t::rp_checkid_hook(basic_openid_message& om) {
 	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;
 	    }
 	}
 	string pfx = om.allocate_ns(OIURI_SREG11,"sreg");
 	if(!fr.empty()) om.set_field(pfx+".required",fr);
 	if(!fo.empty()) om.set_field(pfx+".optional",fo);
 	if(!policy_url.empty()) om.set_field(pfx+".policy_url",policy_url);
     }
 
     void sreg_t::checkid_hook(basic_openid_message& om) {
 	rp_checkid_hook(om); }
 
     void sreg_t::rp_id_res_hook(const basic_openid_message& om,
 	    const basic_openid_message& sp) {
 	clear();
 	string pfx;
 	try {
 	    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; }
 	}
 	pfx += '.';
 	for(fields_iterator f=fields_BEGIN;f<fields_END;++f) {
 	    string fn = pfx; fn+=f->fieldname;
 	    if(!sp.has_field(fn)) continue;
 	    has_fields |= f->fieldbit;
 	    response[f->fieldbit]=sp.get_field(fn);
 	}
     }
 
     void sreg_t::id_res_hook(const basic_openid_message& om,
 	    const basic_openid_message& sp) {
 	rp_id_res_hook(om,sp); }
 
     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);
     }
 
     void sreg_t::clear() {