X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fsys-file-reader.c;h=c9c843dfaf4dd83cee88f7dd510284fa37e516a7;hb=20ab4257de9330d8ad358fd8f66ebcd75bd1846a;hp=de2c47a59ce3335ae849bf144bd8b67954cc51bb;hpb=173d1687aea88e0e5e1b1d8615ed68ebefb15d08;p=pspp

diff --git a/src/data/sys-file-reader.c b/src/data/sys-file-reader.c
index de2c47a59c..c9c843dfaf 100644
--- a/src/data/sys-file-reader.c
+++ b/src/data/sys-file-reader.c
@@ -595,7 +595,7 @@ read_variable_record (struct sfm_reader *r, struct dictionary *dict,
 
   /* Check variable name. */
   if (name[0] == '$' || name[0] == '#')
-    sys_error (r, "Variable name begins with invalid character `%c'.",
+    sys_error (r, _("Variable name begins with invalid character `%c'."),
                name[0]);
   if (!var_is_plausible_name (name, false))
     sys_error (r, _("Invalid variable name `%s'."), name);
@@ -1052,8 +1052,8 @@ read_mrsets (struct sfm_reader *r, size_t size, size_t count,
           mrset->type = MRSET_MC;
           if (!text_match (text, ' '))
             {
-              sys_warn (r, _("Missing space following 'C' at offset %zu "
-                             "in MRSETS record"), text_pos (text));
+              sys_warn (r, _("Missing space following `%c' at offset %zu "
+                             "in MRSETS record"), 'C', text_pos (text));
               break;
             }
         }
@@ -1070,8 +1070,8 @@ read_mrsets (struct sfm_reader *r, size_t size, size_t count,
           mrset->cat_source = MRSET_COUNTEDVALUES;
           if (!text_match (text, ' '))
             {
-              sys_warn (r, _("Missing space following 'E' at offset %zu "
-                             "in MRSETS record"), text_pos (text));
+              sys_warn (r, _("Missing space following `%c' at offset %zu "
+                             "in MRSETS record"), 'E',  text_pos (text));
               break;
             }
 
@@ -1080,12 +1080,12 @@ read_mrsets (struct sfm_reader *r, size_t size, size_t count,
             mrset->label_from_var_label = true;
           else if (strcmp (number, "1"))
             sys_warn (r, _("Unexpected label source value `%s' "
-                           "following 'E' at offset %zu in MRSETS record"),
+                           "following `E' at offset %zu in MRSETS record"),
                       number, text_pos (text));
         }
       else
         {
-          sys_warn (r, _("Missing 'C', 'D', or 'E' at offset %zu "
+          sys_warn (r, _("Missing `C', `D', or `E' at offset %zu "
                          "in MRSETS record."),
                     text_pos (text));
           break;
@@ -2298,6 +2298,8 @@ sys_msg (struct sfm_reader *r, int class, const char *format, va_list args)
   m.severity = msg_class_to_severity (class);
   m.where.file_name = NULL;
   m.where.line_number = 0;
+  m.where.first_column = 0;
+  m.where.last_column = 0;
   m.text = ds_cstr (&text);
 
   msg_emit (&m);