Export account_output from output.c
Adjust calls to pass account variable explicitly.
Call it from lens_default as well.
diff --git a/lens_default.c b/lens_default.c
index 6e87a8e..fc8b0e4 100644
--- a/lens_default.c
+++ b/lens_default.c
@@ -107,19 +107,11 @@
#undef HANDLE_WIDTH
static int
-account(int *countp, int c)
-{
- if (c >= 0)
- *countp += c;
- return c;
-}
-
-static int
acc_fprintf(int *countp, FILE *stream, const char *format, ...)
{
va_list pa;
va_start(pa, format);
- int i = account(countp, vfprintf(stream, format, pa));
+ int i = account_output(countp, vfprintf(stream, format, pa));
va_end(pa);
return i;
@@ -181,7 +173,8 @@
{
int written = 0;
if (acc_fprintf(&written, stream, "'") < 0
- || account(&written, format_char(stream, value, arguments)) < 0
+ || account_output(&written,
+ format_char(stream, value, arguments)) < 0
|| acc_fprintf(&written, stream, "'") < 0)
return -1;