X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvalue-labels.c;h=a1310227f4b655328e5ba79d427be2e507330fb7;hb=e9aa6e433b846849da90550f6800095d569fb549;hp=a9d3d8751799d5fc6bc1d4ea0e2184ae28858982;hpb=b0bf9b1b0f727fafac4296a048e3f45db5936f81;p=pspp

diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c
index a9d3d87517..a1310227f4 100644
--- a/src/language/dictionary/value-labels.c
+++ b/src/language/dictionary/value-labels.c
@@ -22,11 +22,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <procedure.h>
+#include <data/procedure.h>
 #include <data/value-labels.h>
 #include <data/variable.h>
 #include <language/command.h>
 #include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
 #include <libpspp/alloc.h>
 #include <libpspp/hash.h>
 #include <libpspp/message.h>
@@ -157,7 +158,7 @@ get_label (struct variable **vars, size_t var_cnt)
               lex_error (_("expecting string"));
 	      return 0;
 	    }
-	  buf_copy_str_rpad (value.s, MAX_SHORT_STRING, ds_c_str (&tokstr));
+	  buf_copy_str_rpad (value.s, MAX_SHORT_STRING, ds_cstr (&tokstr));
 	}
       else
 	{
@@ -180,7 +181,7 @@ get_label (struct variable **vars, size_t var_cnt)
 	  msg (SW, _("Truncating value label to 60 characters."));
 	  ds_truncate (&tokstr, 60);
 	}
-      label = ds_c_str (&tokstr);
+      label = ds_cstr (&tokstr);
 
       for (i = 0; i < var_cnt; i++)
         val_labs_replace (vars[i]->val_labs, value, label);