X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flexer.c;h=ff93e0d9f42f9aa27520e4434f50377de7a8145e;hb=5a33cc6d78fe87ff5e9bd32ea4af3f895e4ad2fc;hp=53b702c4e8bb1ba851d4f767ef463b55d7d71ba1;hpb=9eb49ba79d7178c565e4447c5fd26eb050d35d63;p=pspp-builds.git

diff --git a/src/lexer.c b/src/lexer.c
index 53b702c4..ff93e0d9 100644
--- a/src/lexer.c
+++ b/src/lexer.c
@@ -116,7 +116,7 @@ restore_token (void)
   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 @@ lex_get (void)
 	    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 @@ lex_put_back_id (const char *id)
   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. */