projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use new Gnulib function dtoastr() to format short, accurate real numbers.
[pspp]
/
src
/
data
/
csv-file-writer.c
diff --git
a/src/data/csv-file-writer.c
b/src/data/csv-file-writer.c
index 70568c3e1d4dfe35fc10857d0aaf6ee1fe654c72..11b7429cbb60c0b32b8692a29173a8219e420d33 100644
(file)
--- a/
src/data/csv-file-writer.c
+++ b/
src/data/csv-file-writer.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2010 Free Software Foundation, Inc.
+ Copyright (C) 2010
, 2011
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
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
@@
-45,6
+45,8
@@
#include "libpspp/message.h"
#include "libpspp/str.h"
#include "libpspp/message.h"
#include "libpspp/str.h"
+#include "gl/ftoastr.h"
+#include "gl/minmax.h"
#include "gl/unlocked-io.h"
#include "gl/xalloc.h"
#include "gl/unlocked-io.h"
#include "gl/xalloc.h"
@@
-280,7
+282,7
@@
csv_write_var__ (struct csv_writer *w, const struct csv_var *cv,
csv_output_format (w, cv, value);
else
{
csv_output_format (w, cv, value);
else
{
- char s[
128
];
+ char s[
MAX (DBL_STRLEN_BOUND, 128)
];
switch (cv->format.type)
{
switch (cv->format.type)
{
@@
-306,7
+308,7
@@
csv_write_var__ (struct csv_writer *w, const struct csv_var *cv,
case FMT_RBHEX:
case FMT_WKDAY:
case FMT_MONTH:
case FMT_RBHEX:
case FMT_WKDAY:
case FMT_MONTH:
-
snprintf (s, sizeof s, "%.*g", DBL_DIG + 1
, value->f);
+
dtoastr (s, sizeof s, 0, 0
, value->f);
if (w->opts.decimal != '.')
{
char *cp = strchr (s, '.');
if (w->opts.decimal != '.')
{
char *cp = strchr (s, '.');