Skip to content

V
varnish-cache
Commit a6419c8a authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

Fix HTC_Reinit() return type

parent 5536bb31
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
bin/varnishd/cache/cache.h
View file @ a6419c8a
...@@ -881,7 +881,7 @@ enum htc_status_e { ...@@ -881,7 +881,7 @@ enum htc_status_e {
void HTC_Init(struct http_conn *htc, struct ws *ws, int fd, struct vsl_log *, void HTC_Init(struct http_conn *htc, struct ws *ws, int fd, struct vsl_log *,
unsigned maxbytes, unsigned maxhdr); unsigned maxbytes, unsigned maxhdr);
int HTC_Reinit(struct http_conn *htc); enum htc_status_e HTC_Reinit(struct http_conn *htc);
enum htc_status_e HTC_Rx(struct http_conn *htc); enum htc_status_e HTC_Rx(struct http_conn *htc);
ssize_t HTC_Read(struct http_conn *htc, void *d, size_t len); ssize_t HTC_Read(struct http_conn *htc, void *d, size_t len);
enum htc_status_e HTC_Complete(struct http_conn *htc); enum htc_status_e HTC_Complete(struct http_conn *htc);
......
bin/varnishd/cache/cache_center.c
View file @ a6419c8a
...@@ -204,7 +204,6 @@ enum cnt_sess_done_ret { ...@@ -204,7 +204,6 @@ enum cnt_sess_done_ret {
static enum cnt_sess_done_ret static enum cnt_sess_done_ret
cnt_sess_done(struct sess *sp, struct worker *wrk, struct req *req) cnt_sess_done(struct sess *sp, struct worker *wrk, struct req *req)
{ {
int i;
CHECK_OBJ_NOTNULL(sp, SESS_MAGIC); CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC); CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
...@@ -258,8 +257,7 @@ cnt_sess_done(struct sess *sp, struct worker *wrk, struct req *req) ...@@ -258,8 +257,7 @@ cnt_sess_done(struct sess *sp, struct worker *wrk, struct req *req)
WS_Reset(wrk->aws, NULL); WS_Reset(wrk->aws, NULL);
req->vxid = VXID_Get(&wrk->vxid_pool); req->vxid = VXID_Get(&wrk->vxid_pool);
i = HTC_Reinit(req->htc); if (HTC_Reinit(req->htc) == HTC_COMPLETE) {
if (i == 1) {
req->t_req = sp->t_idle; req->t_req = sp->t_idle;
wrk->stats.sess_pipeline++; wrk->stats.sess_pipeline++;
return (SESS_DONE_RET_START); return (SESS_DONE_RET_START);
......
bin/varnishd/cache/cache_httpconn.c
View file @ a6419c8a
...@@ -75,7 +75,7 @@ HTC_Init(struct http_conn *htc, struct ws *ws, int fd, struct vsl_log *vsl, ...@@ -75,7 +75,7 @@ HTC_Init(struct http_conn *htc, struct ws *ws, int fd, struct vsl_log *vsl,
* the ws somewhere, because WS_Reset only fiddles pointers. * the ws somewhere, because WS_Reset only fiddles pointers.
*/ */
int enum htc_status_e
HTC_Reinit(struct http_conn *htc) HTC_Reinit(struct http_conn *htc)
{ {
unsigned l; unsigned l;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment