X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmodify-vars.c;h=4911664d92870846784613a1bd9505f35e960432;hb=b7e33825d30a18360f24a18faf4b7d2e9efb8142;hp=ed28ee4c671d4a0df0c4a185e9ec0dcb4b93930d;hpb=6bc566408707e018674d1776d835c78368b6b5a3;p=pspp

diff --git a/src/modify-vars.c b/src/modify-vars.c
index ed28ee4c67..4911664d92 100644
--- a/src/modify-vars.c
+++ b/src/modify-vars.c
@@ -19,11 +19,12 @@
 
 #include <config.h>
 #include <stdlib.h>
-#include <assert.h>
+#include "error.h"
 #include "algorithm.h"
 #include "alloc.h"
 #include "bitvector.h"
 #include "command.h"
+#include "dictionary.h"
 #include "error.h"
 #include "hash.h"
 #include "lexer.h"
@@ -83,8 +84,12 @@ cmd_modify_vars (void)
 
   size_t i;
 
-  lex_match_id ("MODIFY");
-  lex_match_id ("VARS");
+  if (temporary != 0)
+    {
+      msg (SE, _("MODIFY VARS may not be used after TEMPORARY.  "
+                 "Temporary transformations will be made permanent."));
+      cancel_temporary (); 
+    }
 
   vm.reorder_vars = NULL;
   vm.reorder_cnt = 0;
@@ -309,7 +314,7 @@ cmd_modify_vars (void)
   if (already_encountered & (1 | 4))
     {
       /* Read the data. */
-      procedure (NULL, NULL, NULL);
+      procedure (NULL, NULL);
     }
 
   if (!rearrange_dict (default_dict, &vm))
@@ -353,14 +358,14 @@ compare_variables_given_ordering (const void *a_, const void *b_,
 struct var_renaming
   {
     struct variable *var;
-    char new_name[9];
+    char new_name[SHORT_NAME_LEN + 1];
   };
 
 /* A algo_compare_func that compares new_name members in struct
    var_renaming structures A and B. */
 static int
 compare_var_renaming_by_new_name (const void *a_, const void *b_,
-                                  void *foo unused) 
+                                  void *foo UNUSED) 
 {
   const struct var_renaming *a = a_;
   const struct var_renaming *b = b_;