projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Slightly generalize case_to_values and case_from_values functions, and
[pspp]
/
src
/
data
/
data-out.c
diff --git
a/src/data/data-out.c
b/src/data/data-out.c
index 8b94da03de39ea527a5ee4e65576a1144839a0c5..38f50fafbd0ed6007058c7d722b67d95de6a0d1a 100644
(file)
--- a/
src/data/data-out.c
+++ b/
src/data/data-out.c
@@
-1,6
+1,5
@@
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@
-27,11
+26,12
@@
#include <stdint.h>
#include <stdlib.h>
#include <time.h>
#include <stdint.h>
#include <stdlib.h>
#include <time.h>
+#include <gsl/gsl_math.h>
#include "calendar.h"
#include "format.h"
#include "settings.h"
#include "calendar.h"
#include "format.h"
#include "settings.h"
-#include "va
riabl
e.h"
+#include "va
lu
e.h"
#include <libpspp/assertion.h>
#include <libpspp/float-format.h>
#include <libpspp/assertion.h>
#include <libpspp/float-format.h>
@@
-153,7
+153,7
@@
output_number (const union value *input, const struct fmt_spec *format,
if (number == SYSMIS)
output_missing (format, output);
if (number == SYSMIS)
output_missing (format, output);
- else if (!
is
finite (number))
+ else if (!
gsl_
finite (number))
output_infinite (number, format, output);
else
{
output_infinite (number, format, output);
else
{
@@
-708,8
+708,8
@@
output_scientific (double number, const struct fmt_spec *format,
p = mempset (p, ' ', ss_length (style->neg_suffix));
assert (p == buf + format->w);
p = mempset (p, ' ', ss_length (style->neg_suffix));
assert (p == buf + format->w);
+ memcpy (output, buf, format->w);
- buf_copy_str_lpad (output, format->w, buf);
return true;
}
\f
return true;
}
\f
@@
-951,7
+951,7
@@
power256 (int x)
static void
output_infinite (double number, const struct fmt_spec *format, char *output)
{
static void
output_infinite (double number, const struct fmt_spec *format, char *output)
{
- assert (!
is
finite (number));
+ assert (!
gsl_
finite (number));
if (format->w >= 3)
{
if (format->w >= 3)
{