X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fmodify-variables.c;h=8de2ee18183161d824cf187743dbcf95276cdfb6;hb=d8ffe656444590f1199f62ac3ebdb9b7692923c2;hp=9fc6fa55c452c3a03ffeba7e7e6633c376f48bc2;hpb=9f4661992f4b481c6dafa6fd53c94ecfe7b3af8c;p=pspp

diff --git a/src/language/dictionary/modify-variables.c b/src/language/dictionary/modify-variables.c
index 9fc6fa55c4..8de2ee1818 100644
--- a/src/language/dictionary/modify-variables.c
+++ b/src/language/dictionary/modify-variables.c
@@ -28,7 +28,6 @@
 #include <libpspp/array.h>
 #include <libpspp/bit-vector.h>
 #include <libpspp/compiler.h>
-#include <libpspp/hash.h>
 #include <libpspp/message.h>
 #include <libpspp/misc.h>
 #include <libpspp/str.h>
@@ -111,7 +110,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
 
 	  if (already_encountered & 1)
 	    {
-	      msg (SE, _("REORDER subcommand may be given at most once."));
+	      msg (SE, _("%s subcommand may be given at most once."), "REORDER");
 	      goto done;
 	    }
 	  already_encountered |= 1;
@@ -138,13 +137,13 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
 			   "of variables."));
 		      goto done;
 		    }
-		  dict_get_vars_mutable (dataset_dict (ds), &v, &nv, 1u << DC_SYSTEM);
+		  dict_get_vars_mutable (dataset_dict (ds), &v, &nv, DC_SYSTEM);
 		}
 	      else
 		{
 		  if (!lex_match (lexer, '('))
 		    {
-		      msg (SE, _("`(' expected on REORDER subcommand."));
+		      msg (SE, _("`(' expected on %s subcommand."), "REORDER");
 		      free (v);
 		      goto done;
 		    }
@@ -174,7 +173,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
 	{
 	  if (already_encountered & 2)
 	    {
-	      msg (SE, _("RENAME subcommand may be given at most once."));
+	      msg (SE, _("%s subcommand may be given at most once."), "RENAME");
 	      goto done;
 	    }
 	  already_encountered |= 2;
@@ -187,7 +186,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
 
 	      if (!lex_match (lexer, '('))
 		{
-		  msg (SE, _("`(' expected on RENAME subcommand."));
+		  msg (SE, _("`(' expected on %s subcommand."), "RENAME");
 		  goto done;
 		}
 	      if (!parse_variables (lexer, dataset_dict (ds),
@@ -367,7 +366,7 @@ compare_variables_given_ordering (const void *a_, const void *b_,
 struct var_renaming
   {
     struct variable *var;
-    char new_name[LONG_NAME_LEN + 1];
+    char new_name[VAR_NAME_LEN + 1];
   };
 
 /* A algo_compare_func that compares new_name members in struct