[gnumeric] Naming: make sure boxed free functions that do ref-counting are called _unref.

[Morten Welinder <mortenw src gnome org>]

commit f11d6c42b185b383bf799b6f879b28739434e4ba
Author: Morten Welinder <terra gnome org>
Date:   Sun Jul 19 12:16:17 2020 -0400

    Naming: make sure boxed free functions that do ref-counting are called _unref.

 plugins/excel/ms-excel-read.c        | 2 +-
 plugins/openoffice/openoffice-read.c | 2 +-
 src/commands.c                       | 4 ++--
 src/dependent.c                      | 4 ++--
 src/dialogs/dialog-sheet-order.c     | 2 +-
 src/dialogs/dialog-solver.c          | 4 ++--
 src/expr-name.c                      | 6 +++---
 src/expr-name.h                      | 2 +-
 src/expr.c                           | 4 ++--
 src/expr.h                           | 2 +-
 src/func.c                           | 6 +++---
 src/wbc-gtk.c                        | 2 +-
 src/workbook.c                       | 6 +++---
 src/workbook.h                       | 2 +-
 14 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/plugins/excel/ms-excel-read.c b/plugins/excel/ms-excel-read.c
index f0c4f46cb9..09497bd9df 100644
--- a/plugins/excel/ms-excel-read.c
+++ b/plugins/excel/ms-excel-read.c
@@ -3510,7 +3510,7 @@ gnm_xl_importer_free (GnmXLImporter *importer)
                g_slist_free (real_order);
        }
 
-       gnm_expr_sharer_destroy (importer->expr_sharer);
+       gnm_expr_sharer_unref (importer->expr_sharer);
 
        g_hash_table_destroy (importer->boundsheet_data_by_stream);
        importer->boundsheet_data_by_stream = NULL;
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 87431825dc..fc80d8257b 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -14253,7 +14253,7 @@ openoffice_file_open (G_GNUC_UNUSED GOFileOpener const *fo, GOIOContext *io_cont
        if (state.openformula_handlermap)
                g_hash_table_destroy (state.openformula_handlermap);
        g_object_unref (contents);
-       gnm_expr_sharer_destroy (state.sharer);
+       gnm_expr_sharer_unref (state.sharer);
        g_free (state.chart.cs_enhanced_path);
        g_free (state.chart.cs_modifiers);
        g_free (state.chart.cs_viewbox);
diff --git a/src/commands.c b/src/commands.c
index 6af8be7dec..299cf857af 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -4800,9 +4800,9 @@ cmd_reorganize_sheets_finalize (GObject *cmd)
        CmdReorganizeSheets *me = CMD_REORGANIZE_SHEETS (cmd);
 
        if (me->old)
-               workbook_sheet_state_free (me->old);
+               workbook_sheet_state_unref (me->old);
        if (me->new)
-               workbook_sheet_state_free (me->new);
+               workbook_sheet_state_unref (me->new);
 
        gnm_command_finalize (cmd);
 }
diff --git a/src/dependent.c b/src/dependent.c
index 26b94e1223..9b87a85285 100644
--- a/src/dependent.c
+++ b/src/dependent.c
@@ -2712,7 +2712,7 @@ do_deps_destroy (Sheet *sheet)
         * are going to be deleted.  However, it is necessary to catch
         * all the different life cycles.
         */
-       gnm_named_expr_collection_free (sheet->names);
+       gnm_named_expr_collection_unref (sheet->names);
        sheet->names = NULL;
 
        deps = sheet->deps;
@@ -2923,7 +2923,7 @@ dependents_workbook_destroy (Workbook *wb)
                g_hash_table_destroy (wb->sheet_order_dependents);
                wb->sheet_order_dependents = NULL;
        }
-       gnm_named_expr_collection_free (wb->names);
+       gnm_named_expr_collection_unref (wb->names);
        wb->names = NULL;
 
        WORKBOOK_FOREACH_SHEET (wb, sheet, do_deps_destroy (sheet););
diff --git a/src/dialogs/dialog-sheet-order.c b/src/dialogs/dialog-sheet-order.c
index 41b0b1ff9a..8124f5cb76 100644
--- a/src/dialogs/dialog-sheet-order.c
+++ b/src/dialogs/dialog-sheet-order.c
@@ -1359,7 +1359,7 @@ dialog_sheet_order_changed (SheetManager *state)
                cmd_reorganize_sheets (wbc, old_state, NULL);
                update_undo (state, wbc);
        } else
-               workbook_sheet_state_free (old_state);
+               workbook_sheet_state_unref (old_state);
 
        workbook_signals_unblock (state);
 }
diff --git a/src/dialogs/dialog-solver.c b/src/dialogs/dialog-solver.c
index b4d109af38..5147283f83 100644
--- a/src/dialogs/dialog-solver.c
+++ b/src/dialogs/dialog-solver.c
@@ -777,7 +777,7 @@ run_solver (SolverState *state, GnmSolverParameters *param)
                                 workbook_sheet_state_new (wb),
                                 (GOUndoBinaryFunc)workbook_sheet_state_restore,
                                 NULL,
-                                (GFreeFunc)workbook_sheet_state_free);
+                                (GFreeFunc)workbook_sheet_state_unref);
                        undo = go_undo_combine (undo, undo_report);
 
                        create_report (sol, state);
@@ -787,7 +787,7 @@ run_solver (SolverState *state, GnmSolverParameters *param)
                                 workbook_sheet_state_new (wb),
                                 (GOUndoBinaryFunc)workbook_sheet_state_restore,
                                 NULL,
-                                (GFreeFunc)workbook_sheet_state_free);
+                                (GFreeFunc)workbook_sheet_state_unref);
                        redo = go_undo_combine (redo, redo_report);
                }
 
diff --git a/src/expr-name.c b/src/expr-name.c
index d9a138dbd5..f9d50cd8e4 100644
--- a/src/expr-name.c
+++ b/src/expr-name.c
@@ -221,7 +221,7 @@ gnm_named_expr_collection_new (void)
 }
 
 /**
- * gnm_named_expr_collection_free:
+ * gnm_named_expr_collection_unref:
  * @names: The collection of names
  *
  * Frees names defined in the local scope.
@@ -232,7 +232,7 @@ gnm_named_expr_collection_new (void)
  *           to sheet1.  That will remain!
  **/
 void
-gnm_named_expr_collection_free (GnmNamedExprCollection *names)
+gnm_named_expr_collection_unref (GnmNamedExprCollection *names)
 {
        if (names != NULL && names->ref_count-- < 2) {
                g_hash_table_destroy (names->names);
@@ -326,7 +326,7 @@ gnm_named_expr_collection_get_type (void)
        if (t == 0) {
                t = g_boxed_type_register_static ("GnmNamedExprCollection",
                         (GBoxedCopyFunc)gnm_named_expr_collection_ref,
-                        (GBoxedFreeFunc)gnm_named_expr_collection_free);
+                        (GBoxedFreeFunc)gnm_named_expr_collection_unref);
        }
        return t;
 }
diff --git a/src/expr-name.h b/src/expr-name.h
index a64bb43e0f..6d1200433c 100644
--- a/src/expr-name.h
+++ b/src/expr-name.h
@@ -67,7 +67,7 @@ GOUndo *expr_name_set_expr_undo_new (GnmNamedExpr *nexpr);
 
 GType gnm_named_expr_collection_get_type (void);
 GnmNamedExprCollection *gnm_named_expr_collection_new (void);
-void gnm_named_expr_collection_free (GnmNamedExprCollection *names);
+void gnm_named_expr_collection_unref (GnmNamedExprCollection *names);
 void gnm_named_expr_collection_unlink (GnmNamedExprCollection *names);
 void gnm_named_expr_collection_relink (GnmNamedExprCollection *names);
 void gnm_named_expr_collection_foreach (GnmNamedExprCollection *names,
diff --git a/src/expr.c b/src/expr.c
index 1437e81d0d..434e9b739d 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -2905,7 +2905,7 @@ gnm_expr_sharer_new (void)
 }
 
 void
-gnm_expr_sharer_destroy (GnmExprSharer *es)
+gnm_expr_sharer_unref (GnmExprSharer *es)
 {
        if (!es || es->ref_count-- > 1)
                return;
@@ -2928,7 +2928,7 @@ gnm_expr_sharer_get_type (void)
        if (t == 0) {
                t = g_boxed_type_register_static ("GnmExprSharer",
                         (GBoxedCopyFunc)gnm_expr_sharer_ref,
-                        (GBoxedFreeFunc)gnm_expr_sharer_destroy);
+                        (GBoxedFreeFunc)gnm_expr_sharer_unref);
        }
        return t;
 }
diff --git a/src/expr.h b/src/expr.h
index cedb98d5f0..ebc608a8e8 100644
--- a/src/expr.h
+++ b/src/expr.h
@@ -227,7 +227,7 @@ GnmValue *gnm_expr_top_eval_fake_array (GnmExprTop const *texpr,
 
 GType             gnm_expr_sharer_get_type (void);
 GnmExprSharer *   gnm_expr_sharer_new  (void);
-void              gnm_expr_sharer_destroy (GnmExprSharer *es);
+void              gnm_expr_sharer_unref (GnmExprSharer *es);
 GnmExprTop const *gnm_expr_sharer_share (GnmExprSharer *es, GnmExprTop const *texpr);
 void              gnm_expr_sharer_report (GnmExprSharer *es);
 
diff --git a/src/func.c b/src/func.c
index afbaf4a9dc..1c2aca8399 100644
--- a/src/func.c
+++ b/src/func.c
@@ -172,7 +172,7 @@ split_at_colon (char const *s, char **rest)
 /* ------------------------------------------------------------------------- */
 
 static void
-gnm_func_group_free (GnmFuncGroup *fn_group)
+gnm_func_group_unref (GnmFuncGroup *fn_group)
 {
        g_return_if_fail (fn_group != NULL);
        g_return_if_fail (fn_group->functions == NULL);
@@ -200,7 +200,7 @@ gnm_func_group_get_type (void)
        if (t == 0) {
                t = g_boxed_type_register_static ("GnmFuncGroup",
                         (GBoxedCopyFunc)gnm_func_group_ref,
-                        (GBoxedFreeFunc)gnm_func_group_free);
+                        (GBoxedFreeFunc)gnm_func_group_unref);
        }
        return t;
 }
@@ -283,7 +283,7 @@ gnm_func_group_remove_func (GnmFuncGroup *fn_group, GnmFunc *func)
                categories = g_list_remove (categories, fn_group);
                if (unknown_cat == fn_group)
                        unknown_cat = NULL;
-               gnm_func_group_free (fn_group);
+               gnm_func_group_unref (fn_group);
        }
 }
 
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 0dcaa9d4ee..d73dff2b94 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -2233,7 +2233,7 @@ cb_workbook_debug_info (WBCGtk *wbcg)
        if (gnm_debug_flag ("expr-sharer")) {
                GnmExprSharer *es = workbook_share_expressions (wb, FALSE);
                gnm_expr_sharer_report (es);
-               gnm_expr_sharer_destroy (es);
+               gnm_expr_sharer_unref (es);
        }
 
        if (gnm_debug_flag ("style-optimize")) {
diff --git a/src/workbook.c b/src/workbook.c
index 1fb44eb1a3..3881df2052 100644
--- a/src/workbook.c
+++ b/src/workbook.c
@@ -690,7 +690,7 @@ workbook_share_expressions (Workbook *wb, gboolean freeit)
        }
 
        if (freeit) {
-               gnm_expr_sharer_destroy (es);
+               gnm_expr_sharer_unref (es);
                es = NULL;
        }
 
@@ -1482,7 +1482,7 @@ workbook_sheet_state_new (const Workbook *wb)
 }
 
 void
-workbook_sheet_state_free (WorkbookSheetState *wss)
+workbook_sheet_state_unref (WorkbookSheetState *wss)
 {
        int i;
 
@@ -1515,7 +1515,7 @@ workbook_sheet_state_get_type (void)
        if (t == 0) {
                t = g_boxed_type_register_static ("WorkbookSheetState",
                         (GBoxedCopyFunc)workbook_sheet_state_ref,
-                        (GBoxedFreeFunc)workbook_sheet_state_free);
+                        (GBoxedFreeFunc)workbook_sheet_state_unref);
        }
        return t;
 }
diff --git a/src/workbook.h b/src/workbook.h
index d2672d52d8..dd65f82759 100644
--- a/src/workbook.h
+++ b/src/workbook.h
@@ -90,7 +90,7 @@ void workbook_detach_view (WorkbookView *wbv);
 
 GType workbook_sheet_state_get_type (void);
 WorkbookSheetState *workbook_sheet_state_new (Workbook const *wb);
-void workbook_sheet_state_free (WorkbookSheetState *wss);
+void workbook_sheet_state_unref (WorkbookSheetState *wss);
 void workbook_sheet_state_restore (Workbook *wb, WorkbookSheetState const *wss);
 int workbook_sheet_state_size  (WorkbookSheetState const *wss);
 char *workbook_sheet_state_diff (WorkbookSheetState const *wss_a,