X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fdata-out.c;h=38f50fafbd0ed6007058c7d722b67d95de6a0d1a;hb=a1fa03b1638263a959df0b2943478a0a4ca4b11a;hp=8b94da03de39ea527a5ee4e65576a1144839a0c5;hpb=0fa141762183890ebd139ccd9264f08db9011539;p=pspp

diff --git a/src/data/data-out.c b/src/data/data-out.c
index 8b94da03de..38f50fafbd 100644
--- 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.
-   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
@@ -27,11 +26,12 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <time.h>
+#include <gsl/gsl_math.h>
 
 #include "calendar.h"
 #include "format.h"
 #include "settings.h"
-#include "variable.h"
+#include "value.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);
-  else if (!isfinite (number))
+  else if (!gsl_finite (number))
     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);
+  memcpy (output, buf, format->w);
 
-  buf_copy_str_lpad (output, format->w, buf);
   return true;
 }
 
@@ -951,7 +951,7 @@ power256 (int x)
 static void
 output_infinite (double number, const struct fmt_spec *format, char *output)
 {
-  assert (!isfinite (number));
+  assert (!gsl_finite (number));
   
   if (format->w >= 3)
     {