X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcsv.c;h=ba1481c9a0c44caf9ab2de9873b67aa2f49dd604;hb=db9910816100d5c8dce9734e441efdcbf9e5b71a;hp=a34282e012ce57da598c962ba59cf11bdd78b33b;hpb=29917c4f5908454803e663d2ad78bca4bc35e805;p=pspp

diff --git a/src/output/csv.c b/src/output/csv.c
index a34282e012..ba1481c9a0 100644
--- a/src/output/csv.c
+++ b/src/output/csv.c
@@ -77,10 +77,9 @@ csv_create (struct file_handle *fh, enum settings_output_devices device_type,
             struct string_map *o)
 {
   struct output_driver *d;
-  struct csv_driver *csv;
   char *quote;
 
-  csv = xzalloc (sizeof *csv);
+  struct csv_driver *csv = XZALLOC (struct csv_driver);
   d = &csv->driver;
   output_driver_init (&csv->driver, &csv_driver_class, fh_get_file_name (fh), device_type);
 
@@ -245,10 +244,7 @@ csv_submit (struct output_driver *driver,
     case OUTPUT_ITEM_CHART:
       break;
 
-    case OUTPUT_ITEM_GROUP_OPEN:
-      break;
-
-    case OUTPUT_ITEM_GROUP_CLOSE:
+    case OUTPUT_ITEM_GROUP:
       break;
 
     case OUTPUT_ITEM_IMAGE:
@@ -267,9 +263,6 @@ csv_submit (struct output_driver *driver,
       csv_output_lines (csv, "");
       break;
 
-    case OUTPUT_ITEM_PAGE_SETUP:
-      break;
-
     case OUTPUT_ITEM_TABLE:
       {
         size_t *layer_indexes;
@@ -296,8 +289,8 @@ struct output_driver_factory csv_driver_factory = { "csv", "-", csv_create };
 
 static const struct output_driver_class csv_driver_class =
   {
-    "csv",
-    csv_destroy,
-    csv_submit,
-    csv_flush,
+    .name = "csv",
+    .destroy = csv_destroy,
+    .submit = csv_submit,
+    .flush = csv_flush,
   };