Replace some calls to xcalloc with XCALLOC

[pspp] / src / ui / gui / psppire-import-assistant.c

diff --git a/src/ui/gui/psppire-import-assistant.c b/src/ui/gui/psppire-import-assistant.c
index 88074bc7b7d5e6625ab5aac75235eeaa8382fe1d..4de70352438dbb2bfc1b70add83ced17ad21fb2c 100644 (file)
--- a/src/ui/gui/psppire-import-assistant.c
+++ b/src/ui/gui/psppire-import-assistant.c
@@ -301,7 +301,8 @@ choose_likely_separators (PsppireImportAssistant *ia)
       hmap_destroy (&count_map[j]);
     }
 
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (get_widget_assert (ia->builder, separators[most_frequent].name)), TRUE);
+  const char* sepname = separators[MAX (0,most_frequent)].name;
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (get_widget_assert (ia->builder, sepname)), TRUE);
 }
 
 static void
@@ -1241,7 +1242,7 @@ textfile_create_reader (PsppireImportAssistant *ia)
 
   int i;
 
-  struct fmt_guesser **fg = xcalloc (n_vars, sizeof *fg);
+  struct fmt_guesser **fg = XCALLOC (n_vars,  struct fmt_guesser *);
   for (i = 0 ; i < n_vars; ++i)
     {
       fg[i] = fmt_guesser_create ();