X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fcount.c;h=e3220d79485a5d94ea9c39f8c24374897c46fcd0;hb=6d7e2826ba9c863f6261e9718e0e822e0ca60aa0;hp=82085d6fe0f6e476d74b9e2d653dfaca34e06ca4;hpb=1339492699ce7e12c9bf9fa17f9d60a66024cbd1;p=pspp

diff --git a/src/count.c b/src/count.c
index 82085d6fe0..e3220d7948 100644
--- a/src/count.c
+++ b/src/count.c
@@ -158,7 +158,7 @@ cmd_count (void)
 	    }
 	}
       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 @@ parse_string_criteria (struct counting * c)
       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 (',');