output: Make groups contain their subitems, and get rid of spv_item.

[pspp] / src / output / spv / spv-legacy-data.c

diff --git a/src/output/spv/spv-legacy-data.c b/src/output/spv/spv-legacy-data.c
index 4e3d72c4a4c1832af4a66d6de64497407d6db1d2..59c9331e9f07161041f147ed4119a60db6c7c089 100644 (file)
--- a/src/output/spv/spv-legacy-data.c
+++ b/src/output/spv/spv-legacy-data.c
@@ -334,7 +334,7 @@ char * WARN_UNUSED_RESULT
 spv_legacy_data_decode (const uint8_t *in, size_t size, struct spv_data *out)
 {
   char *error = NULL;
-  memset (out, 0, sizeof *out);
+  *out = (struct spv_data) SPV_DATA_INITIALIZER;
 
   struct spvbin_input input;
   spvbin_input_init (&input, in, size);
@@ -394,7 +394,7 @@ spv_legacy_data_decode (const uint8_t *in, size_t size, struct spv_data *out)
 
 error:
   spv_data_uninit (out);
-  memset (out, 0, sizeof *out);
+  *out = (struct spv_data) SPV_DATA_INITIALIZER;
   spvob_free_legacy_binary (lb);
   return error;
 }