treewide: Replace <name>_cnt by n_<name>s and <name>_cap by allocated_<name>.

[pspp] / src / ui / gui / psppire-variable-sheet.c

diff --git a/src/ui/gui/psppire-variable-sheet.c b/src/ui/gui/psppire-variable-sheet.c
index b0fcbfca909b52375f0757711a2154dfba6bdbd3..486d85c4ca2dd0aa37f1cf6526cc2dbd9ad5bb05 100644 (file)
--- a/src/ui/gui/psppire-variable-sheet.c
+++ b/src/ui/gui/psppire-variable-sheet.c
@@ -48,6 +48,9 @@ set_var_type (PsppireVariableSheet *sheet)
   struct variable *var =
     psppire_dict_get_variable (PSPPIRE_DICT (dict), row);
 
+  if (var == NULL)
+    return;
+
   const struct fmt_spec *format = var_get_write_format (var);
   struct fmt_spec fmt = *format;
   GtkWindow *win = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (sheet)));
@@ -69,6 +72,9 @@ set_missing_values (PsppireVariableSheet *sheet)
   struct variable *var =
     psppire_dict_get_variable (PSPPIRE_DICT (dict), row);
 
+  if (var == NULL)
+    return;
+
   struct missing_values mv;
   if (GTK_RESPONSE_OK ==
       psppire_missing_val_dialog_run (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (sheet))),
@@ -92,6 +98,9 @@ set_value_labels (PsppireVariableSheet *sheet)
   struct variable *var =
     psppire_dict_get_variable (PSPPIRE_DICT (dict), row);
 
+  if (var == NULL)
+    return;
+
   struct val_labs *vls =
     psppire_val_labs_dialog_run (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (sheet))), var);
 
@@ -316,7 +325,7 @@ change_var_property (PsppireVariableSheet *var_sheet, gint col, gint row, const
   PsppireDict *dict = NULL;
   g_object_get (var_sheet, "data-model", &dict, NULL);
 
-  int n_rows = psppire_dict_get_var_cnt (dict);
+  int n_rows = psppire_dict_get_n_vars (dict);
   if (row > n_rows)
     return;
 
@@ -326,6 +335,8 @@ change_var_property (PsppireVariableSheet *var_sheet, gint col, gint row, const
   if (NULL == var)
     var = psppire_dict_insert_variable (dict, row, NULL);
 
+  g_return_if_fail (var);
+
   switch (col)
     {
     case DICT_TVM_COL_NAME: