Remove `init' member from struct variable, which was essentially

unused.

diff --git a/src/data/ChangeLog b/src/data/ChangeLog
index 38510757495a9eae8b5276f175aa134b8cc0ad4b..c7cd626eea1c4806128bad1137c942e73e366c9f 100644 (file)
--- a/src/data/ChangeLog
+++ b/src/data/ChangeLog
@@ -1,3 +1,11 @@
+Wed Apr 26 14:55:19 2006  Ben Pfaff  <blp@gnu.org>
+
+       * variable.h: (struct variable) Remove `init' member and all
+       references to it from other files.  It was initialized in several
+       places, but nothing really ever used it for anything worthwhile.
+       Thanks to Jason Stover for pointing out how confusing this
+       member is.
+
 Sun Apr 23 22:04:45 2006  Ben Pfaff  <blp@gnu.org>
 
        Continue reforming error message support.  In this phase, get rid

diff --git a/src/data/dictionary.c b/src/data/dictionary.c
index d2d93c3bd2f535d59dac071f0ce4fbe2f57d7772..b2fe10cfc4c091e2a726635cc20a03192c802120 100644 (file)
--- a/src/data/dictionary.c
+++ b/src/data/dictionary.c
@@ -282,7 +282,6 @@ dict_create_var (struct dictionary *d, const char *name, int width)
   v->width = width;
   v->fv = d->next_value_idx;
   v->nv = width == 0 ? 1 : DIV_RND_UP (width, 8);
-  v->init = 1;
   v->reinit = dict_class_from_id (v->name) != DC_SCRATCH;
   v->index = d->var_cnt;
   mv_init (&v->miss, width);
@@ -359,7 +358,6 @@ dict_clone_var (struct dictionary *d, const struct variable *ov,
      short_name[] is intentionally not copied, because there is
      no reason to give a new variable with potentially a new name
      the same short name. */
-  nv->init = 1;
   nv->reinit = ov->reinit;
   mv_copy (&nv->miss, &ov->miss);
   nv->print = ov->print;

diff --git a/src/data/variable.h b/src/data/variable.h
index 181d70c88931f08e90c7c7de8bfa1a8aca36566d..3a5015be5dedb6c2a92c98bfa75168e570c0c6fd 100644 (file)
--- a/src/data/variable.h
+++ b/src/data/variable.h
@@ -64,7 +64,6 @@ struct variable
 
     /* Case information. */
     int fv, nv;                        /* Index into `value's, number of values. */
-    bool init;                  /* True if needs init and possibly reinit. */
     bool reinit;                /* True: reinitialize; false: leave. */
 
     /* Data for use by containing dictionary. */

diff --git a/src/language/data-io/data-list.c b/src/language/data-io/data-list.c
index 3a6f807c00f63a4b11af204da886b27fcd59b9f8..cf8cd6bd47cbda580441fad7fcdce08d5b9cf1ec 100644 (file)
--- a/src/language/data-io/data-list.c
+++ b/src/language/data-io/data-list.c
@@ -545,8 +545,6 @@ fixed_parse_compatible (struct fixed_parsing_state *fx,
        {
          convert_fmt_ItoO (&input, &v->print);
          v->write = v->print;
-          if (!in_input_program () && !in_file_type ())
-            v->init = 0;
        }
       else
        {
@@ -653,9 +651,6 @@ dump_fmt_list (struct fixed_parsing_state *fx, struct fmt_list *f,
                return 0;
              }
            
-            if (!in_input_program () && !in_file_type ())
-              v->init = 0;
-
             spec = xmalloc (sizeof *spec);
             spec->v = v;
            spec->input = f->f;
@@ -862,9 +857,6 @@ parse_free (struct dls_var_spec **first, struct dls_var_spec **last)
            }
          v->print = v->write = output;
 
-          if (!in_input_program () && !in_file_type ())
-            v->init = 0;
-
           spec = xmalloc (sizeof *spec);
           spec->input = input;
           spec->v = v;

diff --git a/src/language/dictionary/numeric.c b/src/language/dictionary/numeric.c
index 0cc3adb984db22ba44d7ee8462dd5c23e104e25a..826f0ebfaad1db44f0ae1a206b5394b88df5edbd 100644 (file)
--- a/src/language/dictionary/numeric.c
+++ b/src/language/dictionary/numeric.c
@@ -196,7 +196,6 @@ cmd_leave (void)
       if (!v[i]->reinit)
        continue;
       v[i]->reinit = 0;
-      v[i]->init = 1;
     }
   free (v);
 

diff --git a/src/language/stats/aggregate.c b/src/language/stats/aggregate.c
index 4b8bf46b365d8ae46025700c3361ea0852074055..f3929815cfe4d3c2549f26140dfc47aab38ce965 100644 (file)
--- a/src/language/stats/aggregate.c
+++ b/src/language/stats/aggregate.c
@@ -591,7 +591,6 @@ parse_aggregate_functions (struct agr_proc *agr)
              }
 
            free (dest[i]);
-            destvar->init = 0;
            if (dest_label[i])
              {
                destvar->label = dest_label[i];

diff --git a/src/language/stats/autorecode.c b/src/language/stats/autorecode.c
index 89ac44db42e2c8c2606bf58789901e4460d20b02..8b7d9aaa5aeda8b021e6ee81fe56467c91e287fe 100644 (file)
--- a/src/language/stats/autorecode.c
+++ b/src/language/stats/autorecode.c
@@ -178,11 +178,8 @@ cmd_autorecode (void)
   ok = procedure (autorecode_proc_func, &arc);
 
   for (i = 0; i < arc.var_cnt; i++)
-    {
-      arc.dst_vars[i] = dict_create_var_assert (default_dict,
-                                                arc.dst_names[i], 0);
-      arc.dst_vars[i]->init = 0;
-    }
+    arc.dst_vars[i] = dict_create_var_assert (default_dict,
+                                              arc.dst_names[i], 0);
 
   recode (&arc);
   arc_free (&arc);

diff --git a/src/language/stats/descriptives.c b/src/language/stats/descriptives.c
index 9a90cc9f119951a26e2e6af57ca7f604e55d86c2..62c0ede0d9a12cd0111bebbeae0cd6fcabf75ff3 100644 (file)
--- a/src/language/stats/descriptives.c
+++ b/src/language/stats/descriptives.c
@@ -661,7 +661,6 @@ setup_z_trns (struct dsc_proc *dsc)
          struct variable *dst_var;
 
          dst_var = dict_create_var_assert (default_dict, dv->z_name, 0);
-          dst_var->init = 0;
          if (dv->v->label)
            {
              dst_var->label = xmalloc (strlen (dv->v->label) + 12);

diff --git a/src/procedure.c b/src/procedure.c
index 422e7c05ca167a34552ac52d0f500cbc3c1a8fbd..69665c8b1b3c9c845fb5d2defe3646a26d64acf4 100644 (file)
--- a/src/procedure.c
+++ b/src/procedure.c
@@ -421,7 +421,7 @@ clear_case (struct ccase *c)
   for (i = 0; i < var_cnt; i++) 
     {
       struct variable *v = dict_get_var (default_dict, i);
-      if (v->init && v->reinit) 
+      if (v->reinit) 
         {
           if (v->type == NUMERIC)
             case_data_rw (c, v->fv)->f = SYSMIS;