From: Ben Pfaff Date: Sat, 9 Feb 2019 22:45:11 +0000 (-0800) Subject: output: Remove table_unshare. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=12fa45a6c1589faf79127fe0f79094c2f0648bd2 output: Remove table_unshare. It was unused. --- diff --git a/src/output/table.c b/src/output/table.c index dd73839990..3690df3bd6 100644 --- a/src/output/table.c +++ b/src/output/table.c @@ -297,80 +297,6 @@ table_collect_footnotes (const struct table_item *item, return n; } -struct table_unshared - { - struct table table; - struct table *subtable; - }; - -static const struct table_class table_unshared_class; - -/* Takes ownership of TABLE and returns a table with the same contents but - which is guaranteed not to be shared (as returned by table_is_shared()). - - If TABLE is unshared, just returns TABLE. - - The only real use for this function is to create a copy of TABLE in which - the headers can be adjusted, which is a pretty specialized use case. */ -struct table * -table_unshare (struct table *table) -{ - if (!table_is_shared (table)) - return table; - else - { - struct table_unshared *tiu = xmalloc (sizeof *tiu); - table_init (&tiu->table, &table_unshared_class); - table_set_nc (&tiu->table, table_nc (table)); - table_set_nr (&tiu->table, table_nr (table)); - table_set_hl (&tiu->table, table_hl (table)); - table_set_hr (&tiu->table, table_hr (table)); - table_set_ht (&tiu->table, table_ht (table)); - table_set_hb (&tiu->table, table_hb (table)); - tiu->subtable = table; - return &tiu->table; - } -} - -static struct table_unshared * -table_unshared_cast (const struct table *table) -{ - assert (table->klass == &table_unshared_class); - return UP_CAST (table, struct table_unshared, table); -} - -static void -table_unshared_destroy (struct table *tiu_) -{ - struct table_unshared *tiu = table_unshared_cast (tiu_); - table_unref (tiu->subtable); - free (tiu); -} - -static void -table_unshared_get_cell (const struct table *tiu_, int x, int y, - struct table_cell *cell) -{ - struct table_unshared *tiu = table_unshared_cast (tiu_); - table_get_cell (tiu->subtable, x, y, cell); -} - -static int -table_unshared_get_rule (const struct table *tiu_, - enum table_axis axis, int x, int y, - struct cell_color *color) -{ - struct table_unshared *tiu = table_unshared_cast (tiu_); - return table_get_rule (tiu->subtable, axis, x, y, color); -} - -static const struct table_class table_unshared_class = - { - table_unshared_destroy, - table_unshared_get_cell, - table_unshared_get_rule, - }; - struct table_string { struct table table; diff --git a/src/output/table.h b/src/output/table.h index 070c07eb12..040e89dcc7 100644 --- a/src/output/table.h +++ b/src/output/table.h @@ -239,7 +239,6 @@ struct table struct table *table_ref (const struct table *); void table_unref (struct table *); bool table_is_shared (const struct table *); -struct table *table_unshare (struct table *); /* Returns the number of columns or rows, respectively, in T. */ static inline int table_nc (const struct table *t)