refactoring

[pspp] / src / language / dictionary / variable-label.c

diff --git a/src/language/dictionary/variable-label.c b/src/language/dictionary/variable-label.c
index c0f80fbdbeac19a9fbcfac9f915ee57a52dd39bf..c4e0df69fede265294c84ea60650e3fc14426145 100644 (file)
--- a/src/language/dictionary/variable-label.c
+++ b/src/language/dictionary/variable-label.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2010, 2011, 2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,8 +19,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "data/dataset.h"
 #include "data/dictionary.h"
-#include "data/procedure.h"
 #include "data/variable.h"
 #include "language/command.h"
 #include "language/lexer/lexer.h"
@@ -36,7 +36,6 @@ int
 cmd_variable_labels (struct lexer *lexer, struct dataset *ds)
 {
   struct dictionary *dict = dataset_dict (ds);
-  const char *dict_encoding = dict_get_encoding (dict);
 
   do
     {
@@ -55,7 +54,7 @@ cmd_variable_labels (struct lexer *lexer, struct dataset *ds)
        }
 
       for (i = 0; i < nv; i++)
-        var_set_label (v[i], lex_tokcstr (lexer), dict_encoding, i == 0);
+        var_set_label (v[i], lex_tokcstr (lexer));
 
       lex_get (lexer);
       while (lex_token (lexer) == T_SLASH)