X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fsys-file-info.c;h=596329516cf7a4c8504349dbb6cc64c45e641e4a;hb=ad7083ff802c7db10adb98833c3f32cf6d2e713e;hp=fc875384c1ad31b3f2afc94cef644745bff9e9ce;hpb=b401615e6db40bf74394839b96600afe3a868a95;p=pspp

diff --git a/src/language/dictionary/sys-file-info.c b/src/language/dictionary/sys-file-info.c
index fc875384c1..596329516c 100644
--- a/src/language/dictionary/sys-file-info.c
+++ b/src/language/dictionary/sys-file-info.c
@@ -77,7 +77,7 @@ cmd_sysfile_info (struct lexer *lexer, struct dataset *ds UNUSED)
   lex_match_id (lexer, "FILE");
   lex_match (lexer, T_EQUALS);
 
-  h = fh_parse (lexer, FH_REF_FILE);
+  h = fh_parse (lexer, FH_REF_FILE, NULL);
   if (!h)
     return CMD_FAILURE;
 
@@ -138,8 +138,7 @@ cmd_sysfile_info (struct lexer *lexer, struct dataset *ds UNUSED)
 
 
   tab_text (t, 0, 10, TAB_LEFT, _("Charset:"));
-  tab_text (t, 1, 10, TAB_LEFT,
-            dict_get_encoding(d) ? dict_get_encoding(d) : _("Unknown"));
+  tab_text (t, 1, 10, TAB_LEFT, dict_get_encoding (d));
 
 
   tab_submit (t);
@@ -197,10 +196,8 @@ cmd_display (struct lexer *lexer, struct dataset *ds)
 	tab_output_text (TAB_LEFT,
 			 _("The active dataset does not have a file label."));
       else
-	{
-	  tab_output_text (TAB_LEFT | TAT_TITLE, _("File label:"));
-	  tab_output_text (TAB_LEFT | TAB_FIX, dict_get_label (dataset_dict (ds)));
-	}
+        tab_output_text_format (TAB_LEFT, _("File label: %s"),
+                                dict_get_label (dataset_dict (ds)));
     }
   else
     {
@@ -396,7 +393,7 @@ display_attributes (struct tab_table *t, const struct attrset *set, int flags,
       for (i = 0; i < n_values; i++)
         {
           if (n_values > 1)
-            tab_text_format (t, c, r, TAB_LEFT, "%s[%d]", name, i + 1);
+            tab_text_format (t, c, r, TAB_LEFT, "%s[%zu]", name, i + 1);
           else
             tab_text (t, c, r, TAB_LEFT, name);
           tab_text (t, c + 1, r, TAB_LEFT, attribute_get_value (attr, i));
@@ -584,19 +581,9 @@ describe_variable (const struct variable *v, struct tab_table *t, int r,
       for (i = 0; i < n_labels; i++)
         {
           const struct val_lab *vl = labels[i];
-	  char buf[MAX_STRING + 1];
 
-	  if (var_is_alpha (v))
-	    {
-              int width = var_get_width (v);
-	      memcpy (buf, value_str (&vl->value, width), width);
-	      buf[width] = 0;
-	    }
-	  else
-	    sprintf (buf, "%g", vl->value.f);
-
-	  tab_text (t, 1, r, TAB_NONE, buf);
-	  tab_text (t, 2, r, TAB_LEFT, val_lab_get_label (vl));
+	  tab_value (t, 1, r, TAB_NONE, &vl->value, v, NULL);
+	  tab_text (t, 2, r, TAB_LEFT, val_lab_get_escaped_label (vl));
 	  r++;
 	}
       free (labels);