zip-reader: Make the zip_reader reference counted.

[pspp] / src / output / driver.c

diff --git a/src/output/driver.c b/src/output/driver.c
index 6f5d4633ce015e754deddb8c34480ae4af451bf3..6dfebab854cf6a3164e4220cf780053b82a1bcca 100644 (file)
--- a/src/output/driver.c
+++ b/src/output/driver.c
@@ -22,6 +22,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
@@ -41,6 +42,7 @@
 #include "gl/error.h"
 #include "gl/xalloc.h"
 #include "gl/xmemdup0.h"
+#include "gl/xvasprintf.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -110,13 +112,11 @@ void
 output_engine_pop (void)
 {
   struct ll *head = ll_pop_head (&engine_stack);
-  struct output_engine *e =ll_data (head, struct output_engine, ll);
+  struct output_engine *e = ll_data (head, struct output_engine, ll);
 
-  while (!llx_is_empty (&e->drivers))
-    {
-      struct output_driver *d = llx_pop_head (&e->drivers, &llx_malloc_mgr);
-      output_driver_destroy (d);
-    }
+  struct output_driver *d;
+  llx_for_each_preremove (d, &e->drivers, &llx_malloc_mgr)
+    output_driver_destroy (d);
   output_item_unref (e->deferred_text);
   free (e->command_name);
   free (e->title);
@@ -141,13 +141,10 @@ static void
 output_submit__ (struct output_engine *e, struct output_item *item)
 {
   struct llx *llx, *next;
-
-  for (llx = llx_head (&e->drivers); llx != llx_null (&e->drivers); llx = next)
+  llx_for_each_safe (llx, next, &e->drivers)
     {
       struct output_driver *d = llx_data (llx);
 
-      next = llx_next (llx);
-
       enum settings_output_type type = SETTINGS_OUTPUT_RESULT;
       switch (item->type)
         {
@@ -299,11 +296,11 @@ void
 output_flush (void)
 {
   struct output_engine *e = engine_stack_top ();
-  struct llx *llx;
 
   flush_deferred_text (e);
-  for (llx = llx_head (&e->drivers); llx != llx_null (&e->drivers);
-       llx = llx_next (llx))
+
+  struct llx *llx;
+  llx_for_each (llx, &e->drivers)
     {
       struct output_driver *d = llx_data (llx);
       if (d->device_type & SETTINGS_DEVICE_TERMINAL && d->class->flush != NULL)
@@ -326,6 +323,17 @@ output_set_title__ (struct output_engine *e, char **dst, const char *src)
                                                page_title, NULL));
 }
 
+void PRINTF_FORMAT (1, 2)
+output_log (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  char *s = xvasprintf (format, args);
+  va_end (args);
+
+  output_submit (text_item_create_nocopy (TEXT_ITEM_LOG, s, NULL));
+}
+
 void
 output_set_title (const char *title)
 {