| Index: trunk/willow/src/include/wbackend.h |
| — | — | @@ -35,7 +35,7 @@ |
| 36 | 36 | struct backend_pool; |
| 37 | 37 | struct backend_cb_data; |
| 38 | 38 | |
| 39 | | -struct backend { |
| | 39 | +struct backend : freelist_allocator<backend> { |
| 40 | 40 | backend(string const &, string const &, address const &); |
| 41 | 41 | |
| 42 | 42 | string be_name; /* IP as specified in config */ |
| Index: trunk/willow/src/willow/whttp_header.cc |
| — | — | @@ -292,14 +292,14 @@ |
| 293 | 293 | size_t vlen, nlen, rnpos; |
| 294 | 294 | while ((rn = find_rn(bufp, bufp + len)) != NULL) { |
| 295 | 295 | for (char const *c = bufp; c < rn; ++c) |
| 296 | | - if (unlikely(*(unsigned char *)c > 0x7f || !*c)) |
| | 296 | + if (*(unsigned char *)c > 0x7f || !*c) |
| 297 | 297 | return io::sink_result_error; |
| 298 | 298 | |
| 299 | 299 | if (rn == bufp) { |
| 300 | 300 | _sink_spigot->sp_cork(); |
| 301 | 301 | discard += bufp - buf + 2; |
| 302 | 302 | /* request with no request is an error */ |
| 303 | | - if (unlikely(!_got_reqtype)) |
| | 303 | + if (!_got_reqtype) |
| 304 | 304 | return io::sink_result_error; |
| 305 | 305 | else { |
| 306 | 306 | if (!_is_response && _http_host.empty()) { |
| — | — | @@ -317,8 +317,8 @@ |
| 318 | 318 | name = bufp; |
| 319 | 319 | |
| 320 | 320 | if (!_got_reqtype) { |
| 321 | | - if (unlikely((!_is_response && parse_reqtype(bufp, rn) == -1) |
| 322 | | - || (_is_response && parse_response(bufp, rn) == -1))) { |
| | 321 | + if ((!_is_response && parse_reqtype(bufp, rn) == -1) |
| | 322 | + || (_is_response && parse_response(bufp, rn) == -1)) { |
| 323 | 323 | _sink_spigot->sp_cork(); |
| 324 | 324 | return io::sink_result_error; |
| 325 | 325 | } |
| — | — | @@ -338,7 +338,7 @@ |
| 339 | 339 | goto next; |
| 340 | 340 | } |
| 341 | 341 | |
| 342 | | - if (unlikely((value = (const char *)memchr(name, ':', rnpos)) == NULL)) { |
| | 342 | + if ((value = (const char *)memchr(name, ':', rnpos)) == NULL) { |
| 343 | 343 | _sink_spigot->sp_cork(); |
| 344 | 344 | return io::sink_result_error; |
| 345 | 345 | } |