Fixed bug in getl separation.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9b73c4773b38df110afa43ded52ff5df9312496e..40946b25fb3f79c298fcd3f0cca116e2062af31e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+Sat Jan  7 13:30:54 WST 2006 John Darrington <john@darrington.wattle.id.au>
+
+        * command.c data-in.c main.c: Fixed bug which crept in when 
+          separating getl from readline.
+
+        * vars-atr.c value-labels.h: Fixed constness of  val_labs_count.
+
 Fri Dec 23 20:59:01 WST 2005 John Darrington <john@darrington.wattle.id.au>
 
        * getl.c error.c: Separated file_loc functionality from error.c

diff --git a/src/command.c b/src/command.c
index c6d7659d09c1c34632487b1df8142c211e508171..a471f38e427e0085ee7da51ea764164d157668f2 100644 (file)
--- a/src/command.c
+++ b/src/command.c
@@ -618,7 +618,7 @@ error:
 int
 cmd_exit (void)
 {
-  if (getl_reading_script)
+  if (getl_reading_script())
     {
       msg (SE, _("This command is not accepted in a syntax file.  "
           "Instead, use FINISH to terminate a syntax file."));

diff --git a/src/data-in.c b/src/data-in.c
index 0c21a380ea2a0833641052ea5dba578441c66c55..ae79806256fba327333846e33aa4357e386ecf27 100644 (file)
--- a/src/data-in.c
+++ b/src/data-in.c
@@ -57,7 +57,7 @@ vdls_error (const struct data_in *i, const char *format, va_list args)
     return;
 
   ds_init (&title, 64);
-  if (!getl_reading_script)
+  if (!getl_reading_script())
     ds_puts (&title, _("data-file error: "));
   if (i->f1 == i->f2)
     ds_printf (&title, _("(column %d"), i->f1);

diff --git a/src/main.c b/src/main.c
index 0441d74a3c0cbc70fff6f8e7aa2fad7d08d9bd3f..be22605b822dec1d0b9d17ccc3a25b584614d039 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -217,7 +217,7 @@ handle_error (int code)
       assert (0);
     }
 
-  if (getl_reading_script)
+  if (getl_reading_script())
     {
       err_break ();
       while (token != T_STOP && token != '.')

diff --git a/src/value-labels.c b/src/value-labels.c
index cff267f09df9848b1e5fcc66c4bac9d407fac915..03eda933ad2820ea2c49647379dae65ac5b00db4 100644 (file)
--- a/src/value-labels.c
+++ b/src/value-labels.c
@@ -111,7 +111,7 @@ val_labs_clear (struct val_labs *vls)
 
 /* Returns the number of value labels in VLS. */
 size_t
-val_labs_count (struct val_labs *vls) 
+val_labs_count (const struct val_labs *vls) 
 {
   assert (vls != NULL);
 

diff --git a/src/value-labels.h b/src/value-labels.h
index 11a97b7e151979b044f64a9ca44cfa81449e0e10..cb27fdfc5aab4c46ef0a1259d07b6fdbc7079329 100644 (file)
--- a/src/value-labels.h
+++ b/src/value-labels.h
@@ -36,7 +36,7 @@ struct val_labs *val_labs_copy (const struct val_labs *);
 void val_labs_set_width (struct val_labs *, int new_width);
 void val_labs_destroy (struct val_labs *);
 void val_labs_clear (struct val_labs *);
-size_t val_labs_count (struct val_labs *);
+size_t val_labs_count (const struct val_labs *);
 
 int val_labs_add (struct val_labs *, union value, const char *);
 int val_labs_replace (struct val_labs *, union value, const char *);

diff --git a/src/vars-atr.c b/src/vars-atr.c
index 160894b4f9fd6d4197788ad8e7226a26152f697a..970ce5673f45c0154ae08640b28bcb92171cc99b 100644 (file)
--- a/src/vars-atr.c
+++ b/src/vars-atr.c
@@ -171,7 +171,7 @@ var_is_valid_name (const char *name, bool issue_error)
   if (lex_id_to_token (name, strlen (name)) != T_ID) 
     {
       if (issue_error)
-        msg (SE, _("%s may not be used as a variable name because it "
+        msg (SE, _("`%s' may not be used as a variable name because it "
                    "is a reserved word."), name);
       return false;
     }