Changed DFM from open-at-first-access to explicit-open. Before,

[pspp] / src / sysfile-info.c

diff --git a/src/sysfile-info.c b/src/sysfile-info.c
index dd33d574f437dbe6f9b3b9ba05c62756ce838554..c67c184e2d037767e7ef0d31a3e945fb56db91dc 100644 (file)
--- a/src/sysfile-info.c
+++ b/src/sysfile-info.c
@@ -77,9 +77,6 @@ cmd_sysfile_info (void)
   int r, nr;
   int i;
 
-  lex_match_id ("SYSFILE");
-  lex_match_id ("INFO");
-
   lex_match_id ("FILE");
   lex_match ('=');
 
@@ -95,7 +92,7 @@ cmd_sysfile_info (void)
   t = tab_create (2, 9, 0);
   tab_vline (t, TAL_1 | TAL_SPACING, 1, 0, 8);
   tab_text (t, 0, 0, TAB_LEFT, _("File:"));
-  tab_text (t, 1, 0, TAB_LEFT, fh_handle_filename (h));
+  tab_text (t, 1, 0, TAB_LEFT, handle_get_filename (h));
   tab_text (t, 0, 1, TAB_LEFT, _("Label:"));
   {
     const char *label = dict_get_label (d);
@@ -180,8 +177,6 @@ cmd_display (void)
   int n;
   struct variable **vl;
 
-  lex_match_id ("DISPLAY");
-
   if (lex_match_id ("MACROS"))
     display_macros ();
   else if (lex_match_id ("DOCUMENTS"))
@@ -247,7 +242,7 @@ cmd_display (void)
        {
          int i, m;
          for (i = 0, m = n; i < n; i++)
-           if (vl[i]->name[0] != '#')
+           if (dict_class_from_id (vl[i]->name) != DC_SCRATCH)
              {
                vl[i] = NULL;
                m--;
@@ -368,11 +363,9 @@ display_variables (struct variable **vl, int n, int as)
   nr = n + 5;
   tab_hline (t, TAL_2, 0, nc - 1, 1);
   tab_text (t, 0, 0, TAB_LEFT | TAT_TITLE, _("Variable"));
+  pc = (as == AS_INDEX ? 1 : 3);
   if (as != AS_NAMES)
-    {
-      pc = (as == AS_INDEX ? 1 : 3);
-      tab_text (t, pc, 0, TAB_LEFT | TAT_TITLE, _("Position"));
-    }
+    tab_text (t, pc, 0, TAB_LEFT | TAT_TITLE, _("Position"));
   if (as == AS_DICTIONARY || as == AS_VARIABLES)
     tab_joint_text (t, 1, 0, 2, 0, TAB_LEFT | TAT_TITLE, _("Description"));
   else if (as == AS_LABELS)