| author | Michael Krelin <hacker@klever.net> | 2008-06-27 21:00:41 (UTC) |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2008-06-27 21:00:41 (UTC) |
| commit | 362678728b8232c9490e14ba14ff323d9a92d6be (patch) (side-by-side diff) | |
| tree | 105675f96fff87916b2fdea8b51ad9fe98c5531d /lib | |
| parent | a344edbdddeac51524001faa10d06f85cfdb041c (diff) | |
| download | libopkele-362678728b8232c9490e14ba14ff323d9a92d6be.zip libopkele-362678728b8232c9490e14ba14ff323d9a92d6be.tar.gz libopkele-362678728b8232c9490e14ba14ff323d9a92d6be.tar.bz2 | |
made gcc 4.3 a bit happier
Signed-off-by: Michael Krelin <hacker@klever.net>
| -rw-r--r-- | lib/discovery.cc | 4 | ||||
| -rw-r--r-- | lib/message.cc | 2 | ||||
| -rw-r--r-- | lib/prequeue_rp.cc | 4 | ||||
| -rw-r--r-- | lib/secret.cc | 2 | ||||
| -rw-r--r-- | lib/util.cc | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/lib/discovery.cc b/lib/discovery.cc index d1989ec..984e308 100644 --- a/lib/discovery.cc +++ b/lib/discovery.cc @@ -341,3 +341,3 @@ namespace opkele { int rb; - for(rb = bytes-hnl-1;rb>0 && isspace(*hv);++hv,--rb); + for(rb = bytes-hnl-1;rb>0 && isspace(*hv);++hv,--rb) ; while(rb>0 && isspace(hv[rb-1])) --rb; @@ -502,3 +502,3 @@ namespace opkele { const char *ns = a[1]; - for(;*ns && isspace(*ns);++ns); + for(;*ns && isspace(*ns);++ns) ; href.assign(ns); diff --git a/lib/message.cc b/lib/message.cc index 524946a..c1f8088 100644 --- a/lib/message.cc +++ b/lib/message.cc @@ -160,3 +160,3 @@ namespace opkele { string::reference c=rv[rv.length()]; - for(c='a';c<='z' && has_field("ns."+rv);++c); + for(c='a';c<='z' && has_field("ns."+rv);++c) ; if(c=='z') diff --git a/lib/prequeue_rp.cc b/lib/prequeue_rp.cc index e499d08..886efae 100644 --- a/lib/prequeue_rp.cc +++ b/lib/prequeue_rp.cc @@ -44,5 +44,5 @@ namespace opkele { - void prequeue_RP::verify_OP(const string& OP,const string& claimed_id,const string& id) const { + void prequeue_RP::verify_OP(const string& OP,const string& _claimed_id,const string& id) const { try { - discover(OP_verifier(OP,id),claimed_id); + discover(OP_verifier(OP,id),_claimed_id); throw id_res_unauthorized(OPKELE_CP_ diff --git a/lib/secret.cc b/lib/secret.cc index d538890..3f1e39c 100644 --- a/lib/secret.cc +++ b/lib/secret.cc @@ -12,3 +12,3 @@ namespace opkele { __r operator() (const __a1& a1,const __a2& a2) const { - return a1^a2; + return (__r)(a1^a2); } diff --git a/lib/util.cc b/lib/util.cc index b702291..d979502 100644 --- a/lib/util.cc +++ b/lib/util.cc @@ -213,3 +213,3 @@ namespace opkele { throw failed_conversion(OPKELE_CP_ "non-hex follows percent in url-encoded string"); - *(ii++) = strtol(tmp,0,16); + *(ii++) = (char)strtol(tmp,0,16); break; @@ -350,6 +350,6 @@ namespace opkele { if( isalpha(cc) || isdigit(cc) || strchr("._~-",cc) ) - pseg += cc; + pseg += (char)cc; else{ pseg += '%'; - pseg += toupper(tmp[0]); pseg += toupper(tmp[1]); + pseg += (char)toupper(tmp[0]); pseg += (char)toupper(tmp[1]); } |