X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvariable-label.c;h=c3bb4c2242b73d4553e00bfbe5cc50dd49ae2cfd;hb=fd0958dc7caa5806b82b9757e2b937c5b7def369;hp=6ddb00a5ef6f8443e9b0e166e179af9fd71a329a;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp

diff --git a/src/language/dictionary/variable-label.c b/src/language/dictionary/variable-label.c
index 6ddb00a5ef..c3bb4c2242 100644
--- a/src/language/dictionary/variable-label.c
+++ b/src/language/dictionary/variable-label.c
@@ -18,22 +18,24 @@
    02110-1301, USA. */
 
 #include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "command.h"
-#include "message.h"
-#include "lexer.h"
-#include "str.h"
-#include "variable.h"
+
+#include <data/procedure.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/message.h>
+#include <libpspp/str.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
-
 int
-cmd_variable_labels (void)
+cmd_variable_labels (struct dataset *ds)
 {
   do
     {
@@ -42,14 +44,14 @@ cmd_variable_labels (void)
 
       size_t i;
 
-      if (!parse_variables (default_dict, &v, &nv, PV_NONE))
-        return CMD_PART_SUCCESS_MAYBE;
+      if (!parse_variables (dataset_dict (ds), &v, &nv, PV_NONE))
+        return CMD_FAILURE;
 
       if (token != T_STRING)
 	{
 	  msg (SE, _("String expected for variable label."));
 	  free (v);
-	  return CMD_PART_SUCCESS_MAYBE;
+	  return CMD_FAILURE;
 	}
       if (ds_length (&tokstr) > 255)
 	{
@@ -60,7 +62,7 @@ cmd_variable_labels (void)
 	{
 	  if (v[i]->label)
 	    free (v[i]->label);
-	  v[i]->label = xstrdup (ds_c_str (&tokstr));
+	  v[i]->label = ds_xstrdup (&tokstr);
 	}
 
       lex_get ();