X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fcorrelations.q;h=5d543098ec986b8737a8c0cd30e198d7cdea0ce9;hb=b5b474193e450bba97610065df0518c08074a7fb;hp=15d21ecee124cd13fa817e6fb90af2a3ce8d8306;hpb=3816248a008a4af75aac6319d0c9929cb7ff679e;p=pspp

diff --git a/src/language/stats/correlations.q b/src/language/stats/correlations.q
index 15d21ecee1..5d543098ec 100644
--- a/src/language/stats/correlations.q
+++ b/src/language/stats/correlations.q
@@ -1,21 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
 
-   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 the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
@@ -29,15 +26,16 @@
 #include <language/data-io/file-handle.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 
+#include "xalloc.h"
+
 /* (headers) */
 
 struct cor_set
   {
     struct cor_set *next;
-    struct variable **v1, **v2;
+    const struct variable **v1, **v2;
     size_t nv1, nv2;
   };
 
@@ -79,9 +77,13 @@ internal_cmd_correlations (struct lexer *lexer, struct dataset *ds)
   matrix_file = NULL;
 
   if (!parse_correlations (lexer, ds, &cmd, NULL))
-    return CMD_FAILURE;
+    {
+      fh_unref (matrix_file);
+      return CMD_FAILURE;
+    }
 
   free_correlations (&cmd);
+  fh_unref (matrix_file);
 
   return CMD_SUCCESS;
 }
@@ -89,7 +91,7 @@ internal_cmd_correlations (struct lexer *lexer, struct dataset *ds)
 static int
 cor_custom_variables (struct lexer *lexer, struct dataset *ds, struct cmd_correlations *cmd UNUSED, void *aux UNUSED)
 {
-  struct variable **v1, **v2;
+  const struct variable **v1, **v2;
   size_t nv1, nv2;
   struct cor_set *cor;
 
@@ -100,13 +102,13 @@ cor_custom_variables (struct lexer *lexer, struct dataset *ds, struct cmd_correl
     return 2;
   lex_match (lexer, '=');
 
-  if (!parse_variables (lexer, dataset_dict (ds), &v1, &nv1,
+  if (!parse_variables_const (lexer, dataset_dict (ds), &v1, &nv1,
 			PV_NO_DUPLICATE | PV_NUMERIC))
     return 0;
-  
+
   if (lex_match (lexer, T_WITH))
     {
-      if (!parse_variables (lexer, dataset_dict (ds), &v2, &nv2,
+      if (!parse_variables_const (lexer, dataset_dict (ds), &v2, &nv2,
 			    PV_NO_DUPLICATE | PV_NUMERIC))
 	{
 	  free (v1);
@@ -129,7 +131,7 @@ cor_custom_variables (struct lexer *lexer, struct dataset *ds, struct cmd_correl
     cor_last = cor_last->next = cor;
   else
     cor_list = cor_last = cor;
-  
+
   return 1;
 }
 
@@ -138,14 +140,15 @@ cor_custom_matrix (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_co
 {
   if (!lex_force_match (lexer, '('))
     return 0;
-  
+
   if (lex_match (lexer, '*'))
     matrix_file = NULL;
-  else 
+  else
     {
+      fh_unref (matrix_file);
       matrix_file = fh_parse (lexer, FH_REF_FILE);
       if (matrix_file == NULL)
-        return 0; 
+        return 0;
     }
 
   if (!lex_force_match (lexer, ')'))