Move var_set and variable parsing declarations into new header.

[pspp-builds.git] / src / language / dictionary / sys-file-info.c

diff --git a/src/language/dictionary/sys-file-info.c b/src/language/dictionary/sys-file-info.c
index 5421a3c1c95069e46f6d42dc9cc69fb046423fee..3f77b1de880f02471a0fd25bdb4b63d569e42c5a 100644 (file)
--- a/src/language/dictionary/sys-file-info.c
+++ b/src/language/dictionary/sys-file-info.c
@@ -18,26 +18,30 @@
    02110-1301, USA. */
 
 #include <config.h>
-#include <libpspp/message.h>
+
 #include <ctype.h>
 #include <stdlib.h>
-#include <libpspp/array.h>
-#include <libpspp/alloc.h>
-#include <language/command.h>
+
 #include <data/dictionary.h>
-#include <libpspp/message.h>
 #include <data/file-handle-def.h>
+#include <data/procedure.h>
+#include <data/sys-file-reader.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
+#include <language/command.h>
 #include <language/data-io/file-handle.h>
-#include <libpspp/hash.h>
 #include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
+#include <libpspp/alloc.h>
+#include <libpspp/array.h>
+#include <libpspp/hash.h>
 #include <libpspp/magic.h>
+#include <libpspp/message.h>
+#include <libpspp/message.h>
 #include <libpspp/misc.h>
-#include <output/output.h>
-#include <data/sys-file-reader.h>
 #include <output/manager.h>
+#include <output/output.h>
 #include <output/table.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -99,7 +103,7 @@ cmd_sysfile_info (void)
   t = tab_create (2, 9, 0);
   tab_vline (t, TAL_GAP, 1, 0, 8);
   tab_text (t, 0, 0, TAB_LEFT, _("File:"));
-  tab_text (t, 1, 0, TAB_LEFT, fh_get_filename (h));
+  tab_text (t, 1, 0, TAB_LEFT, fh_get_file_name (h));
   tab_text (t, 0, 1, TAB_LEFT, _("Label:"));
   {
     const char *label = dict_get_label (d);
@@ -479,11 +483,11 @@ describe_variable (struct variable *v, struct tab_table *t, int r, int as)
           double x, y;
           mv_pop_range (&mv, &x, &y);
           if (x == LOWEST)
-            cp += nsprintf (cp, "LOWEST THRU %g", y);
+            cp += sprintf (cp, "LOWEST THRU %g", y);
           else if (y == HIGHEST)
-            cp += nsprintf (cp, "%g THRU HIGHEST", x);
+            cp += sprintf (cp, "%g THRU HIGHEST", x);
           else
-            cp += nsprintf (cp, "%g THRU %g", x, y);
+            cp += sprintf (cp, "%g THRU %g", x, y);
           cnt++;
         }
       while (mv_has_value (&mv)) 
@@ -491,9 +495,9 @@ describe_variable (struct variable *v, struct tab_table *t, int r, int as)
           union value value;
           mv_pop_value (&mv, &value);
           if (cnt++ > 0)
-            cp += nsprintf (cp, "; ");
+            cp += sprintf (cp, "; ");
           if (v->type == NUMERIC)
-            cp += nsprintf (cp, "%g", value.f);
+            cp += sprintf (cp, "%g", value.f);
           else 
             {
               *cp++ = '"';