Fix root cause of bug worked around by previous check-in, and remove

workaround.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2c524f329c25d3d360cd15a3fa8eb38f603c971a..704fce07e70205afa0e84e142aad7ba7d6951e75 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+Fri Feb 20 23:22:14 2004  Ben Pfaff  <blp@gnu.org>
+
+       * dictionary.c: (dict_create_var) Fix root cause of bug worked
+       around by previous change log entry.
+       
+       * compute.c: (lvalue_finalize) Remove workaround from previous
+       change log entry.
+
 Fri Feb 20 14:37:41 WAST 2004 John Darrington <john@darrington.wattle.id.au>
 
        * compute.c: Fixed a bug where the Format was not getting set for 

diff --git a/src/compute.c b/src/compute.c
index d26bf1ed2dd441d8f1406353b75b29b4105d227b..aed443853d9a0d65800be651c7ebc80e2d368630 100644 (file)
--- a/src/compute.c
+++ b/src/compute.c
@@ -397,15 +397,9 @@ lvalue_finalize (struct lvalue *lvalue,
     {
       compute->variable = dict_lookup_var (default_dict, lvalue->var_name);
       if (compute->variable == NULL)
-       {
-         struct fmt_spec input_spec = { 0,8,2 };
          compute->variable = dict_create_var_assert (default_dict,
                                                      lvalue->var_name, 0);
 
-                 convert_fmt_ItoO (&input_spec, &compute->variable->print);
-         compute->variable->write = compute->variable->print;
-       }
-
       compute->fv = compute->variable->fv;
       compute->width = compute->variable->width;
 

diff --git a/src/dictionary.c b/src/dictionary.c
index 0f7133ecf59dd5c5e716cd21aa0515b8a18292be..9b69c89844a347e041269e783f0a54a9af366e95 100644 (file)
--- a/src/dictionary.c
+++ b/src/dictionary.c
@@ -250,6 +250,7 @@ dict_create_var (struct dictionary *d, const char *name, int width)
       v->print.w = v->width;
       v->print.d = 0;
     }
+  v->write = v->print;
   v->val_labs = val_labs_create (v->width);
   v->label = NULL;