X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fsys-file-info.c;h=97bf3df58a9c2035151f01cff8bcb27794e16f70;hb=b0bf9b1b0f727fafac4296a048e3f45db5936f81;hp=0234b833ca9fed36b8ff70336df5790dab740161;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp-builds.git

diff --git a/src/language/dictionary/sys-file-info.c b/src/language/dictionary/sys-file-info.c
index 0234b833..97bf3df5 100644
--- a/src/language/dictionary/sys-file-info.c
+++ b/src/language/dictionary/sys-file-info.c
@@ -18,25 +18,29 @@
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+
 #include <ctype.h>
 #include <stdlib.h>
-#include "array.h"
-#include "alloc.h"
-#include "command.h"
-#include "dictionary.h"
-#include "message.h"
-#include "file-handle-def.h"
-#include "hash.h"
-#include "lexer.h"
-#include "magic.h"
-#include "misc.h"
-#include "output.h"
-#include "sys-file-reader.h"
-#include "manager.h"
-#include "table.h"
-#include "value-labels.h"
-#include "variable.h"
+
+#include <data/dictionary.h>
+#include <data/file-handle-def.h>
+#include <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 <language/lexer/lexer.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/manager.h>
+#include <output/output.h>
+#include <output/table.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -96,9 +100,9 @@ cmd_sysfile_info (void)
   sfm_close_reader (reader);
 
   t = tab_create (2, 9, 0);
-  tab_vline (t, TAL_1 | TAL_SPACING, 1, 0, 8);
+  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);
@@ -200,7 +204,7 @@ cmd_display (void)
       else
 	{
 	  tab_output_text (TAB_LEFT | TAT_TITLE, _("File label:"));
-	  tab_output_text (TAB_LEFT | TAT_FIX, dict_get_label (default_dict));
+	  tab_output_text (TAB_LEFT | TAB_FIX, dict_get_label (default_dict));
 	}
     }
   else
@@ -311,7 +315,7 @@ display_documents (void)
 		 && len > 0)
 	    len--;
 	  buf[len + 1] = 0;
-	  tab_output_text (TAB_LEFT | TAT_FIX | TAT_NOWRAP, buf);
+	  tab_output_text (TAB_LEFT | TAB_FIX | TAT_NOWRAP, buf);
 	}
     }
 }