pivot-table: Fix memory leak in pivot_table_destroy()

[pspp] / src / output / spv / spv.h

diff --git a/src/output/spv/spv.h b/src/output/spv/spv.h
index 1753cdaabd3dd99c55a63b236649ee7e89af0863..d1706f4e7ecc4334c2e4d49e6f45b3fdc6335161 100644 (file)
--- a/src/output/spv/spv.h
+++ b/src/output/spv/spv.h
@@ -116,8 +116,8 @@ struct spv_item
     char *structure_member;
 
     enum spv_item_type type;
-    char *label;
-    char *command_id;           /* Unique command identifier. */
+    char *label;                /* Localized label. */
+    char *command_id;           /* Non-localized unique command identifier. */
 
     /* Whether the item is visible.
        For SPV_ITEM_HEADING, false indicates that the item is collapsed.
@@ -130,7 +130,7 @@ struct spv_item
 
     /* SPV_ITEM_TABLE only. */
     struct pivot_table *table;    /* NULL if not yet loaded. */
-    struct spv_table_look *table_look;
+    struct pivot_table_look *table_look;
     char *bin_member;
     char *xml_member;
     char *subtype;
@@ -157,7 +157,7 @@ size_t spv_item_get_n_children (const struct spv_item *);
 struct spv_item *spv_item_get_child (const struct spv_item *, size_t idx);
 
 bool spv_item_is_table (const struct spv_item *);
-struct pivot_table *spv_item_get_table (const struct spv_item *);
+const struct pivot_table *spv_item_get_table (const struct spv_item *);
 
 bool spv_item_is_text (const struct spv_item *);
 const struct pivot_value *spv_item_get_text (const struct spv_item *);
@@ -198,7 +198,7 @@ char *spv_item_get_legacy_table (const struct spv_item *, struct _xmlDoc **)
   WARN_UNUSED_RESULT;
 
 void spv_item_set_table_look (struct spv_item *,
-                              const struct spv_table_look *);
+                              const struct pivot_table_look *);
 
 char *spv_decode_fmt_spec (uint32_t u32, struct fmt_spec *) WARN_UNUSED_RESULT;