/* PSPP - a program for statistical analysis.
- Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
w->opts = *opts;
- w->encoding = (dict_get_encoding (dict)
- ? xstrdup (dict_get_encoding (dict))
- : NULL);
+ w->encoding = xstrdup (dict_get_encoding (dict));
w->n_csv_vars = dict_get_var_cnt (dict);
w->csv_vars = xnmalloc (w->n_csv_vars, sizeof *w->csv_vars);
else
{
char s[MAX (DBL_STRLEN_BOUND, 128)];
+ char *cp;
switch (cv->format.type)
{
case FMT_WKDAY:
case FMT_MONTH:
dtoastr (s, sizeof s, 0, 0, value->f);
- if (w->opts.decimal != '.')
- {
- char *cp = strchr (s, '.');
- if (cp != NULL)
- *cp = w->opts.decimal;
- }
+ cp = strpbrk (s, ".,");
+ if (cp != NULL)
+ *cp = w->opts.decimal;
break;
case FMT_DATE: