[master] e1a0cd5 use enum vsl_status in VUT_Main()
Nils Goroll
nils.goroll at uplex.de
Mon Feb 26 20:57:09 UTC 2018
commit e1a0cd558cd5cae6a12a181a6f56023eae5b38c0
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Mon Feb 26 21:33:49 2018 +0100
use enum vsl_status in VUT_Main()
diff --git a/lib/libvarnishapi/vut.c b/lib/libvarnishapi/vut.c
index 6766cb9..86a324b 100644
--- a/lib/libvarnishapi/vut.c
+++ b/lib/libvarnishapi/vut.c
@@ -390,11 +390,9 @@ VUT_Main(struct VUT *vut)
}
i = VSLQ_Dispatch(vut->vslq, vut_dispatch, vut);
- if (i == 1)
- /* Call again */
+ if (i == vsl_more)
continue;
- else if (i == 0) {
- /* Nothing to do but wait */
+ else if (i == vsl_end) {
if (vut->idle_f) {
i = vut->idle_f(vut);
if (i)
@@ -402,10 +400,8 @@ VUT_Main(struct VUT *vut)
}
VTIM_sleep(0.01);
continue;
- } else if (i == -1) {
- /* EOF */
+ } else if (i == vsl_e_eof)
break;
- }
if (vut->vsm == NULL)
break;
@@ -414,14 +410,14 @@ VUT_Main(struct VUT *vut)
(void)VSLQ_Flush(vut->vslq, vut_dispatch, vut);
- if (i == -2) {
- /* Abandoned */
+ if (i == vsl_e_abandon) {
fprintf(stderr, "Log abandoned (vsl)\n");
VSLQ_SetCursor(vut->vslq, NULL);
hascursor = 0;
- } else if (i < -2)
- /* Overrun */
+ } else if (i == vsl_e_overrun)
fprintf(stderr, "Log overrun\n");
+ else
+ fprintf(stderr, "Error %d from VSLQ_Dispatch()", i);
}
return (i);
More information about the varnish-commit
mailing list