X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fformat.c;h=069ec3afba4b5b6f334d78d0d2407a553ac72f62;hb=22e46e245aa0a8afb2dba1dd936379a18c3c8f8d;hp=e2b163a5097549625637954087e1688a740f56ca;hpb=5bacd5c053e285ccfba287d2b28079f1d1c49cc9;p=pspp

diff --git a/src/data/format.c b/src/data/format.c
index e2b163a509..069ec3afba 100644
--- a/src/data/format.c
+++ b/src/data/format.c
@@ -1,21 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    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
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
@@ -367,7 +364,7 @@ fmt_to_string (const struct fmt_spec *f, char buffer[FMT_STRING_LEN_MAX + 1])
 /* Returns true if A and B are identical formats,
    false otherwise. */
 bool
-fmt_equal (const struct fmt_spec *a, const struct fmt_spec *b) 
+fmt_equal (const struct fmt_spec *a, const struct fmt_spec *b)
 {
   return a->type == b->type && a->w == b->w && a->d == b->d;
 }
@@ -495,7 +492,7 @@ fmt_is_numeric (enum fmt_type type)
    category.  Thus, the return value may be tested for equality
    or compared bitwise against a mask of FMT_CAT_* values. */
 enum fmt_category
-fmt_get_category (enum fmt_type type) 
+fmt_get_category (enum fmt_type type)
 {
   return get_fmt_desc (type)->category;
 }
@@ -505,7 +502,7 @@ fmt_get_category (enum fmt_type type)
 enum fmt_type
 fmt_input_to_output (enum fmt_type type)
 {
-  switch (fmt_get_category (type)) 
+  switch (fmt_get_category (type))
     {
     case FMT_CAT_STRING:
       return FMT_A;
@@ -597,19 +594,21 @@ fmt_dollar_template (const struct fmt_spec *fmt)
   struct string s = DS_EMPTY_INITIALIZER;
   int c;
 
+  assert (fmt->type == FMT_DOLLAR);
+
   ds_put_char (&s, '$');
   for (c = MAX (fmt->w - fmt->d - 1, 0); c > 0; )
     {
       ds_put_char (&s, '#');
-      if (--c % 4 == 0 && c > 0) 
+      if (--c % 4 == 0 && c > 0)
         {
           ds_put_char (&s, fmt_grouping_char (fmt->type));
           --c;
         }
     }
-  if (fmt->d > 0) 
+  if (fmt->d > 0)
     {
-      ds_put_char (&s, '.');
+      ds_put_char (&s, fmt_decimal_char (fmt->type));
       ds_put_char_multiple (&s, '#', fmt->d);
     }