X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fcsv-file-writer.c;h=279c63685d15c0b150862b17cc49072c6f353f7b;hb=36bba0ffbec3b8432d4ececb720bf033053f5d46;hp=77224945bc9959aca8b18b2a64046bcd3f2031c6;hpb=339f1956cc727eda788638644ef93ab7852b31cd;p=pspp

diff --git a/src/data/csv-file-writer.c b/src/data/csv-file-writer.c
index 77224945bc..279c63685d 100644
--- a/src/data/csv-file-writer.c
+++ b/src/data/csv-file-writer.c
@@ -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
@@ -225,7 +225,7 @@ 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)
@@ -368,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;