[Pspp-cvs] Changes to pspp/src/count.c

[Ben Pfaff]

Index: pspp/src/count.c
diff -u pspp/src/count.c:1.17 pspp/src/count.c:1.18
--- pspp/src/count.c:1.17       Mon May  2 06:21:20 2005
+++ pspp/src/count.c    Mon May 16 07:33:16 2005
@@ -158,7 +158,7 @@
            }
        }
       else
-       st_trim_copy (cnt->n, tokid, sizeof cnt->n);
+       str_copy_trunc (cnt->n, sizeof cnt->n, tokid);
 
       lex_get ();
       if (!lex_force_match ('='))
@@ -349,7 +349,7 @@
       cur = &c->crit.s[n++];
       cur->type = CNT_SINGLE;
       cur->s = malloc (len + 1);
-      st_pad_copy (cur->s, ds_c_str (&tokstr), len + 1);
+      str_copy_rpad (cur->s, len + 1, ds_c_str (&tokstr));
       lex_get ();
 
       lex_match (',');