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

[Ben Pfaff]

Index: pspp/src/lexer.c
diff -u pspp/src/lexer.c:1.18 pspp/src/lexer.c:1.19
--- pspp/src/lexer.c:1.18       Tue May  3 06:36:17 2005
+++ pspp/src/lexer.c    Mon May 16 07:33:17 2005
@@ -116,7 +116,7 @@
   assert (put_token != 0);
   token = put_token;
   ds_replace (&tokstr, ds_c_str (&put_tokstr));
-  st_trim_copy (tokid, ds_c_str (&tokstr), sizeof tokid);
+  str_copy_trunc (tokid, sizeof tokid, ds_c_str (&tokstr));
   tokval = put_tokval;
   put_token = 0;
 }
@@ -358,7 +358,7 @@
            ds_putc (&tokstr, *prog++);
 
          /* Copy tokstr to tokid, possibly truncating it.*/
-         st_trim_copy (tokid, ds_c_str (&tokstr), sizeof tokid);
+         str_copy_trunc (tokid, sizeof tokid, ds_c_str (&tokstr));
 
           /* Determine token type. */
          token = lex_id_to_token (ds_c_str (&tokstr), ds_length (&tokstr));
@@ -720,7 +720,7 @@
   save_token ();
   token = T_ID;
   ds_replace (&tokstr, id);
-  st_trim_copy (tokid, ds_c_str (&tokstr), sizeof tokid);
+  str_copy_trunc (tokid, sizeof tokid, ds_c_str (&tokstr));
 }
 
 /* Weird line processing functions. */