[Pspp-cvs] pspp/src/data ChangeLog format.c

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 06/12/10 04:04:38

Modified files:
        src/data       : ChangeLog format.c 

Log message:
                * format.c (fmt_dollar_template): Use user's decimal point
                character.  Add assertion.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/ChangeLog?cvsroot=pspp&r1=1.84&r2=1.85
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/format.c?cvsroot=pspp&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/ChangeLog,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- ChangeLog   10 Dec 2006 04:03:34 -0000      1.84
+++ ChangeLog   10 Dec 2006 04:04:38 -0000      1.85
@@ -1,3 +1,8 @@
+Sat Dec  9 20:04:22 2006  Ben Pfaff  <address@hidden>
+
+       * format.c (fmt_dollar_template): Use user's decimal point
+       character.  Add assertion.
+
 Sat Dec  9 20:02:25 2006  Ben Pfaff  <address@hidden>
 
        * format.c (fmt_dollar_template): New function, based on

Index: format.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/format.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- format.c    10 Dec 2006 04:03:34 -0000      1.17
+++ format.c    10 Dec 2006 04:04:38 -0000      1.18
@@ -597,6 +597,8 @@
   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; )
     {
@@ -609,7 +611,7 @@
     }
   if (fmt->d > 0) 
     {
-      ds_put_char (&s, '.');
+      ds_put_char (&s, fmt_decimal_char (fmt->type));
       ds_put_char_multiple (&s, '#', fmt->d);
     }