summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2008-06-27 21:00:41 (UTC)
committer Michael Krelin <hacker@klever.net>2008-06-27 21:00:41 (UTC)
commit362678728b8232c9490e14ba14ff323d9a92d6be (patch) (unidiff)
tree105675f96fff87916b2fdea8b51ad9fe98c5531d
parenta344edbdddeac51524001faa10d06f85cfdb041c (diff)
downloadlibopkele-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>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--include/opkele/iterator.h4
-rw-r--r--lib/discovery.cc4
-rw-r--r--lib/message.cc2
-rw-r--r--lib/prequeue_rp.cc4
-rw-r--r--lib/secret.cc2
-rw-r--r--lib/util.cc6
6 files changed, 11 insertions, 11 deletions
diff --git a/include/opkele/iterator.h b/include/opkele/iterator.h
index 28c1c83..8f86234 100644
--- a/include/opkele/iterator.h
+++ b/include/opkele/iterator.h
@@ -155,7 +155,7 @@ namespace opkele {
155 155
156 basic_filterator<IT>& operator++() { 156 basic_filterator<IT>& operator++() {
157 bool found = false; 157 bool found = false;
158 for(++it;!(it==ei || (found=is_interesting()));++it); 158 for(++it;!(it==ei || (found=is_interesting()));++it) ;
159 if(!found) empty=true; 159 if(!found) empty=true;
160 return *this; 160 return *this;
161 } 161 }
@@ -167,7 +167,7 @@ namespace opkele {
167 167
168 void prepare() { 168 void prepare() {
169 bool found = false; 169 bool found = false;
170 for(;!(it==ei || (found=is_interesting()));++it); 170 for(;!(it==ei || (found=is_interesting()));++it) ;
171 if(!found) empty = true; 171 if(!found) empty = true;
172 } 172 }
173 virtual bool is_interesting() const = 0; 173 virtual bool is_interesting() const = 0;
diff --git a/lib/discovery.cc b/lib/discovery.cc
index d1989ec..984e308 100644
--- a/lib/discovery.cc
+++ b/lib/discovery.cc
@@ -339,7 +339,7 @@ namespace opkele {
339 const char *hv = ++colon; 339 const char *hv = ++colon;
340 size_t hnl = colon-h; 340 size_t hnl = colon-h;
341 int rb; 341 int rb;
342 for(rb = bytes-hnl-1;rb>0 && isspace(*hv);++hv,--rb); 342 for(rb = bytes-hnl-1;rb>0 && isspace(*hv);++hv,--rb) ;
343 while(rb>0 && isspace(hv[rb-1])) --rb; 343 while(rb>0 && isspace(hv[rb-1])) --rb;
344 if(rb) { 344 if(rb) {
345 if( (hnl>=sizeof(XRDS_HEADER)) 345 if( (hnl>=sizeof(XRDS_HEADER))
@@ -500,7 +500,7 @@ namespace opkele {
500 rels.assign(a[1]); 500 rels.assign(a[1]);
501 }else if( !strcasecmp(a[0],"href") ) { 501 }else if( !strcasecmp(a[0],"href") ) {
502 const char *ns = a[1]; 502 const char *ns = a[1];
503 for(;*ns && isspace(*ns);++ns); 503 for(;*ns && isspace(*ns);++ns) ;
504 href.assign(ns); 504 href.assign(ns);
505 string::size_type lns=href.find_last_not_of(data::_whitespace_chars); 505 string::size_type lns=href.find_last_not_of(data::_whitespace_chars);
506 href.erase(lns+1); 506 href.erase(lns+1);
diff --git a/lib/message.cc b/lib/message.cc
index 524946a..c1f8088 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -158,7 +158,7 @@ namespace opkele {
158 string rv = pfx; 158 string rv = pfx;
159 if(has_field("ns."+rv)) { 159 if(has_field("ns."+rv)) {
160 string::reference c=rv[rv.length()]; 160 string::reference c=rv[rv.length()];
161 for(c='a';c<='z' && has_field("ns."+rv);++c); 161 for(c='a';c<='z' && has_field("ns."+rv);++c) ;
162 if(c=='z') 162 if(c=='z')
163 throw exception(OPKELE_CP_ "Failed to allocate namespace"); 163 throw exception(OPKELE_CP_ "Failed to allocate namespace");
164 } 164 }
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
@@ -42,9 +42,9 @@ namespace opkele {
42 OP_verifier& operator++(int) { return *this; } 42 OP_verifier& operator++(int) { return *this; }
43 }; 43 };
44 44
45 void prequeue_RP::verify_OP(const string& OP,const string& claimed_id,const string& id) const { 45 void prequeue_RP::verify_OP(const string& OP,const string& _claimed_id,const string& id) const {
46 try { 46 try {
47 discover(OP_verifier(OP,id),claimed_id); 47 discover(OP_verifier(OP,id),_claimed_id);
48 throw id_res_unauthorized(OPKELE_CP_ 48 throw id_res_unauthorized(OPKELE_CP_
49 "OP is not authorized to make an assertion regarding the identity"); 49 "OP is not authorized to make an assertion regarding the identity");
50 }catch(__OP_verifier_good_input& ovgi) { 50 }catch(__OP_verifier_good_input& ovgi) {
diff --git a/lib/secret.cc b/lib/secret.cc
index d538890..3f1e39c 100644
--- a/lib/secret.cc
+++ b/lib/secret.cc
@@ -10,7 +10,7 @@ namespace opkele {
10 template<class __a1,class __a2,class __r> 10 template<class __a1,class __a2,class __r>
11 struct bitwise_xor : public binary_function<__a1,__a2,__r> { 11 struct bitwise_xor : public binary_function<__a1,__a2,__r> {
12 __r operator() (const __a1& a1,const __a2& a2) const { 12 __r operator() (const __a1& a1,const __a2& a2) const {
13 return a1^a2; 13 return (__r)(a1^a2);
14 } 14 }
15 }; 15 };
16 16
diff --git a/lib/util.cc b/lib/util.cc
index b702291..d979502 100644
--- a/lib/util.cc
+++ b/lib/util.cc
@@ -211,7 +211,7 @@ namespace opkele {
211 tmp[1] = *i; 211 tmp[1] = *i;
212 if(!(isxdigit(tmp[0]) && isxdigit(tmp[1]))) 212 if(!(isxdigit(tmp[0]) && isxdigit(tmp[1])))
213 throw failed_conversion(OPKELE_CP_ "non-hex follows percent in url-encoded string"); 213 throw failed_conversion(OPKELE_CP_ "non-hex follows percent in url-encoded string");
214 *(ii++) = strtol(tmp,0,16); 214 *(ii++) = (char)strtol(tmp,0,16);
215 break; 215 break;
216 default: 216 default:
217 *(ii++) = *i; break; 217 *(ii++) = *i; break;
@@ -348,10 +348,10 @@ namespace opkele {
348 throw bad_input(OPKELE_CP_ "Invalid percent-encoded character in URI being normalized"); 348 throw bad_input(OPKELE_CP_ "Invalid percent-encoded character in URI being normalized");
349 int cc = strtol(tmp,0,16); 349 int cc = strtol(tmp,0,16);
350 if( isalpha(cc) || isdigit(cc) || strchr("._~-",cc) ) 350 if( isalpha(cc) || isdigit(cc) || strchr("._~-",cc) )
351 pseg += cc; 351 pseg += (char)cc;
352 else{ 352 else{
353 pseg += '%'; 353 pseg += '%';
354 pseg += toupper(tmp[0]); pseg += toupper(tmp[1]); 354 pseg += (char)toupper(tmp[0]); pseg += (char)toupper(tmp[1]);
355 } 355 }
356 }else if(qf) { 356 }else if(qf) {
357 rv += pseg; rv += c; 357 rv += pseg; rv += c;