output: Modernize how drivers are initialized.

[pspp] / src / ui / gui / psppire-output-window.c

diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c
index 46535b0f2362fd7cc8777cdeeaf18a67057c7e9b..14fc1fd0dcd5588d47bab694006ef8ddb624506a 100644 (file)
--- a/src/ui/gui/psppire-output-window.c
+++ b/src/ui/gui/psppire-output-window.c
@@ -166,13 +166,15 @@ static struct output_driver_class psppire_output_class =
 void
 psppire_output_window_setup (void)
 {
-  struct psppire_output_driver *pod = XZALLOC (struct psppire_output_driver);
-  struct output_driver *d;
-
-  d = &pod->driver;
-  output_driver_init (d, &psppire_output_class, "PSPPIRE",
-                      SETTINGS_DEVICE_UNFILTERED);
-  output_driver_register (d);
+  struct psppire_output_driver *pod = xmalloc (sizeof *pod);
+  *pod = (struct psppire_output_driver) {
+    .driver = {
+      .class = &psppire_output_class,
+      .name = xstrdup ("PSPPIRE"),
+      .device_type = SETTINGS_DEVICE_UNFILTERED,
+    },
+  };
+  output_driver_register (&pod->driver);
 }
 
 \f