#include "language/lexer/lexer.h"
#include "libpspp/message.h"
-#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
struct casewriter *writer;
struct file_handle *handle;
- struct csv_writer_options csv_opts;
-
bool replace;
bool retain_unselected;
include_var_names = false;
use_value_labels = false;
use_print_formats = false;
- decimal = settings_get_decimal_char (FMT_F);
+ decimal = settings_get_fmt_settings ()->decimal;
delimiter = 0;
qualifier = '"';
dict_delete_scratch_vars (dict);
dict_compact_values (dict);
- csv_opts.recode_user_missing = recode_user_missing;
- csv_opts.include_var_names = include_var_names;
- csv_opts.use_value_labels = use_value_labels;
- csv_opts.use_print_formats = use_print_formats;
- csv_opts.decimal = decimal;
- csv_opts.delimiter = (delimiter ? delimiter
- : type == TAB_FILE ? '\t'
- : decimal == '.' ? ','
- : ';');
- csv_opts.qualifier = qualifier;
-
+ struct csv_writer_options csv_opts = {
+ .recode_user_missing = recode_user_missing,
+ .include_var_names = include_var_names,
+ .use_value_labels = use_value_labels,
+ .use_print_formats = use_print_formats,
+ .decimal = decimal,
+ .delimiter = (delimiter ? delimiter
+ : type == TAB_FILE ? '\t'
+ : decimal == '.' ? ','
+ : ';'),
+ .qualifier = qualifier,
+ };
writer = csv_writer_open (handle, dict, &csv_opts);
if (writer == NULL)
goto error;