Commit db448e56 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Make VUT_Error() always exit and insist on non-zero exit status.

Use fprintf(stderr,...) for progress messages.
I doubt we need a VUT_Msg() for that, given that only one use was
from outside vut.c, and that is probably an API mistake.
parent 35a4eb76
...@@ -326,8 +326,8 @@ main(int argc, char * const *argv) ...@@ -326,8 +326,8 @@ main(int argc, char * const *argv)
if (!i) if (!i)
break; break;
if (isnan(t_start) && t_arg > 0.) { if (isnan(t_start) && t_arg > 0.) {
VUT_Error(0, "Can't open log -" fprintf(stderr, "Can't open log -"
" retrying for %.0f seconds", t_arg); " retrying for %.0f seconds\n", t_arg);
t_start = VTIM_real(); t_start = VTIM_real();
} }
if (t_arg <= 0.) if (t_arg <= 0.)
......
...@@ -67,8 +67,9 @@ struct VUT { ...@@ -67,8 +67,9 @@ struct VUT {
extern struct VUT VUT; extern struct VUT VUT;
//lint -sem(VUT_Error, r_no)
void VUT_Error(int status, const char *fmt, ...) void VUT_Error(int status, const char *fmt, ...)
__v_printflike(2, 3); __v_printflike(2, 3) __attribute__((__noreturn__));
int VUT_g_Arg(const char *arg); int VUT_g_Arg(const char *arg);
......
...@@ -115,14 +115,14 @@ VUT_Error(int status, const char *fmt, ...) ...@@ -115,14 +115,14 @@ VUT_Error(int status, const char *fmt, ...)
{ {
va_list ap; va_list ap;
assert(status != 0);
AN(fmt); AN(fmt);
va_start(ap, fmt); va_start(ap, fmt);
vfprintf(stderr, fmt, ap); vfprintf(stderr, fmt, ap);
va_end(ap); va_end(ap);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
if (status) exit(status);
exit(status);
} }
int int
...@@ -278,8 +278,8 @@ VUT_Setup(void) ...@@ -278,8 +278,8 @@ VUT_Setup(void)
break; break;
if (isnan(t_start) && VUT.t_arg > 0.) { if (isnan(t_start) && VUT.t_arg > 0.) {
VUT_Error(0, "Cannot open log -" fprintf(stderr, "Cannot open log -"
" retrying for %.0f seconds", VUT.t_arg); " retrying for %.0f seconds\n", VUT.t_arg);
t_start = VTIM_real(); t_start = VTIM_real();
} }
VSM_Close(VUT.vsm); VSM_Close(VUT.vsm);
...@@ -299,7 +299,7 @@ VUT_Setup(void) ...@@ -299,7 +299,7 @@ VUT_Setup(void)
else else
VUT_Error(1, "%s", VSL_Error(VUT.vsl)); VUT_Error(1, "%s", VSL_Error(VUT.vsl));
} else if (!isnan(t_start)) } else if (!isnan(t_start))
VUT_Error(0, "Log opened"); fprintf(stderr, "Log opened\n");
} }
if (c) if (c)
...@@ -394,7 +394,7 @@ VUT_Main(void) ...@@ -394,7 +394,7 @@ VUT_Main(void)
} }
VSLQ_SetCursor(VUT.vslq, &c); VSLQ_SetCursor(VUT.vslq, &c);
AZ(c); AZ(c);
VUT_Error(0, "Log reacquired"); fprintf(stderr, "Log reacquired\n");
} }
i = VSLQ_Dispatch(VUT.vslq, vut_dispatch, NULL); i = VSLQ_Dispatch(VUT.vslq, vut_dispatch, NULL);
...@@ -424,10 +424,10 @@ VUT_Main(void) ...@@ -424,10 +424,10 @@ VUT_Main(void)
if (i == -2) if (i == -2)
/* Abandoned */ /* Abandoned */
VUT_Error(0, "Log abandoned"); fprintf(stderr, "Log abandoned\n");
else if (i < -2) else if (i < -2)
/* Overrun */ /* Overrun */
VUT_Error(0, "Log overrun"); fprintf(stderr, "Log overrun\n");
VSM_Close(VUT.vsm); VSM_Close(VUT.vsm);
} }
......
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