Remove unreachable code

[pspp] / src / language / data-io / matrix-reader.c

diff --git a/src/language/data-io/matrix-reader.c b/src/language/data-io/matrix-reader.c
index 02970c994ec71facf88d38dedb606671bfd15d87..861937d32c7b4da4a81dbbe21331bd270b7fed99 100644 (file)
--- a/src/language/data-io/matrix-reader.c
+++ b/src/language/data-io/matrix-reader.c
@@ -204,7 +204,7 @@ next_matrix_from_reader (struct matrix_material *mm,
   for (i = 0; i < n_vars; ++i)
     {
       const int w = var_get_width (mr->varname);
-      uint8_t s[w];
+      char s[w];
       memset (s, 0, w);
       const char *name = var_get_name (vars[i]);
       strcpy (s, name);
@@ -219,8 +219,7 @@ next_matrix_from_reader (struct matrix_material *mm,
       int col, row;
       for (col = 0; col < n_vars; ++col)
        {
-         const struct variable *cv
-           = vars ? vars[col] : dict_get_var (mr->dict, var_get_dict_index (mr->varname) + 1 + col);
+         const struct variable *cv = vars[col];
          double x = case_data (c, cv)->f;
          if (0 == strncasecmp ((char *)value_str (uv, 8), "N       ", 8))
            for (row = 0; row < n_vars; ++row)