VECTOR: Improve error messages and coding style.

[pspp] / 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 3ab4c040991d74c126d74501ac799ae6853ef829..3dc375213788f6b1c4d65d403596ac4276596f64 100644 (file)
--- a/src/language/dictionary/sys-file-info.c
+++ b/src/language/dictionary/sys-file-info.c
@@ -144,7 +144,7 @@ cmd_sysfile_info (struct lexer *lexer, struct dataset *ds)
 
   if (h == NULL)
     {
-      lex_sbc_missing ("FILE");
+      lex_sbc_missing (lexer, "FILE");
       goto error;
     }
 
@@ -389,7 +389,7 @@ cmd_display (struct lexer *lexer, struct dataset *ds)
                                 vl, n, attribute_flags);
         }
       else
-        msg (SW, _("No variables to display."));
+        msg (SN, _("No variables to display."));
 
       free (vl);
     }
@@ -718,7 +718,7 @@ display_vectors (const struct dictionary *dict, int sorted)
   size_t n_vectors = dict_get_n_vectors (dict);
   if (n_vectors == 0)
     {
-      msg (SW, _("No vectors defined."));
+      msg (SN, _("No vectors defined."));
       return;
     }
 
@@ -836,7 +836,7 @@ recode_strings (struct pool *pool,
           ss_rtrim (&utf8, ss_cstr (" "));
           utf8.string[utf8.length] = '\0';
 
-          if (ids[i] && !id_is_plausible (utf8.string, false))
+          if (ids[i] && !id_is_plausible (utf8.string))
             error = EINVAL;
         }
 
@@ -1002,11 +1002,12 @@ report_encodings (const struct file_handle *h, struct pool *pool,
   struct pivot_table *table = pivot_table_create__ (
     pivot_value_new_text_format (N_("Usable encodings for %s."),
                                  fh_get_name (h)), "Usable Encodings");
-  table->caption = pivot_value_new_text_format (
-    N_("Encodings that can successfully read %s (by specifying the encoding "
-       "name on the GET command's ENCODING subcommand).  Encodings that "
-       "yield identical text are listed together."),
-    fh_get_name (h));
+  pivot_table_set_caption (
+    table, pivot_value_new_text_format (
+      N_("Encodings that can successfully read %s (by specifying the encoding "
+         "name on the GET command's ENCODING subcommand).  Encodings that "
+         "yield identical text are listed together."),
+      fh_get_name (h)));
 
   pivot_dimension_create (table, PIVOT_AXIS_COLUMN, N_("Encodings"),
                           N_("Encodings"));
@@ -1041,9 +1042,10 @@ report_encodings (const struct file_handle *h, struct pool *pool,
     pivot_value_new_text_format (N_("%s Encoded Text Strings"),
                                  fh_get_name (h)),
     "Alternate Encoded Text Strings");
-  table->caption = pivot_value_new_text (
-    N_("Text strings in the file dictionary that the previously listed "
-       "encodings interpret differently, along with the interpretations."));
+  pivot_table_set_caption (
+    table, pivot_value_new_text (
+      N_("Text strings in the file dictionary that the previously listed "
+         "encodings interpret differently, along with the interpretations.")));
 
   pivot_dimension_create (table, PIVOT_AXIS_COLUMN, N_("Text"), N_("Text"));