X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fdata%2Fcsv-file-writer.c;h=279c63685d15c0b150862b17cc49072c6f353f7b;hb=95cde62bdf5210c1c60dad5598a888b864f93161;hp=8f24bf3bfbf7d3114fa02933a50633c481d89c9b;hpb=8318b3fffc62b96271e4bbbeb67fe706f797e993;p=pspp

diff --git a/src/data/csv-file-writer.c b/src/data/csv-file-writer.c
index 8f24bf3bfb..279c63685d 100644
--- a/src/data/csv-file-writer.c
+++ b/src/data/csv-file-writer.c
@@ -110,7 +110,7 @@ csv_writer_open (struct file_handle *fh, const struct dictionary *dict,
 
   w->encoding = xstrdup (dict_get_encoding (dict));
 
-  w->n_csv_vars = dict_get_var_cnt (dict);
+  w->n_csv_vars = dict_get_n_vars (dict);
   w->csv_vars = xnmalloc (w->n_csv_vars, sizeof *w->csv_vars);
   for (i = 0; i < w->n_csv_vars; i++)
     {
@@ -118,9 +118,9 @@ csv_writer_open (struct file_handle *fh, const struct dictionary *dict,
       struct csv_var *cv = &w->csv_vars[i];
 
       cv->width = var_get_width (var);
-      cv->case_index = var_get_case_index (var);
+      cv->case_index = var_get_dict_index (var);
 
-      cv->format = *var_get_print_format (var);
+      cv->format = var_get_print_format (var);
       if (opts->recode_user_missing)
         mv_copy (&cv->missing, var_get_missing_values (var));
       else
@@ -143,7 +143,7 @@ csv_writer_open (struct file_handle *fh, const struct dictionary *dict,
   w->rf = replace_file_start (fh, "w", 0666,  &w->file);
   if (w->rf == NULL)
     {
-      msg (ME, _("Error opening `%s' for writing as a system file: %s."),
+      msg (ME, _("Error opening `%s' for writing as a CSV file: %s."),
            fh_get_file_name (fh), strerror (errno));
       goto error;
     }
@@ -225,7 +225,8 @@ static void
 csv_output_format (struct csv_writer *w, const struct csv_var *cv,
                    const union value *value)
 {
-  char *s = data_out (value, w->encoding, &cv->format);
+  char *s = data_out (value, w->encoding, cv->format,
+                      settings_get_fmt_settings ());
   struct substring ss = ss_cstr (s);
   if (cv->format.type != FMT_A)
     ss_trim (&ss, ss_cstr (" "));
@@ -367,7 +368,7 @@ static void
 csv_write_var (struct csv_writer *w, const struct csv_var *cv,
                const union value *value)
 {
-  if (mv_is_value_missing (&cv->missing, value, MV_USER))
+  if (mv_is_value_missing (&cv->missing, value) == MV_USER)
     {
       union value missing;