Changed all the licence notices in all the files.

[pspp] / src / matrix-data.c

diff --git a/src/matrix-data.c b/src/matrix-data.c
index a57680d841e9174f44556361801d10074bd3f836..4dc3fb18ca10331b1222a4370d38f4b11be0083f 100644 (file)
--- a/src/matrix-data.c
+++ b/src/matrix-data.c
@@ -14,8 +14,8 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #include <config.h>
 #include "error.h"
@@ -394,7 +394,7 @@ cmd_matrix_data (void)
              goto lossage;
            }
 
-         if (!lex_integer_p () || lex_integer () < 1)
+         if (!lex_is_integer () || lex_integer () < 1)
            {
              lex_error (_("expecting positive integer"));
              goto lossage;
@@ -413,7 +413,7 @@ cmd_matrix_data (void)
              goto lossage;
            }
 
-         if (!lex_integer_p () || lex_integer () < 1)
+         if (!lex_is_integer () || lex_integer () < 1)
            {
              lex_error (_("expecting positive integer"));
              goto lossage;
@@ -963,8 +963,7 @@ read_matrices_without_rowtype (struct matrix_data_pgm *mx)
   nr.split_values = xmalloc (sizeof *nr.split_values
                              * dict_get_split_cnt (default_dict));
 
-  vfm_source = create_case_source (&matrix_data_without_rowtype_source_class,
-                                   default_dict, &nr);
+  vfm_source = create_case_source (&matrix_data_without_rowtype_source_class, &nr);
   
   procedure (NULL, NULL);
 
@@ -1495,7 +1494,7 @@ read_matrices_with_rowtype (struct matrix_data_pgm *mx)
   mx->cells = 0;
 
   vfm_source = create_case_source (&matrix_data_with_rowtype_source_class,
-                                   default_dict, &wr);
+                                   &wr);
   procedure (NULL, NULL);
 
   free (wr.split_values);
@@ -1667,11 +1666,8 @@ wr_output_data (struct wr_aux_data *wr,
          int factor;
 
          for (factor = 0; factor < mx->n_factors; factor++)
-           {
-             case_data_rw (c, mx->factors[factor]->fv)->f
-               = iter->factors[factor];
-             debug_printf (("f:%s ", factors[factor]->name));
-           }
+            case_data_rw (c, mx->factors[factor]->fv)->f
+              = iter->factors[factor];
        }
        
        {