From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 30 Jan 2011 23:27:06 +0000 (-0800)
Subject: sys-file-reader: Avoid redundant "within system file" in messages.
X-Git-Tag: v0.7.7~85
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32bcf82d7525c3e50d63064ff32b1545989836b8;p=pspp-builds.git

sys-file-reader: Avoid redundant "within system file" in messages.

All system file message already state the system file's name, which should
be enough identification.
---

diff --git a/src/data/sys-file-reader.c b/src/data/sys-file-reader.c
index 84342369..d2f48fb4 100644
--- a/src/data/sys-file-reader.c
+++ b/src/data/sys-file-reader.c
@@ -604,9 +604,7 @@ read_variable_record (struct sfm_reader *r, struct dictionary *dict,
     sys_error (r, _("Bad width %d for variable %s."), width, name);
   var = dict_create_var (dict, name, width);
   if (var == NULL)
-    sys_error (r,
-               _("Duplicate variable name `%s' within system file."),
-               name);
+    sys_error (r, _("Duplicate variable name `%s'."), name);
 
   /* Set the short name the same as the long name. */
   var_set_short_name (var, 0, var_get_name (var));
@@ -1283,8 +1281,7 @@ read_long_var_name_map (struct sfm_reader *r, size_t size, size_t count,
       if (strcasecmp (var_get_short_name (var, 0), long_name)
           && dict_lookup_var (dict, long_name) != NULL)
         {
-          sys_warn (r, _("Duplicate long variable name `%s' "
-                         "within system file."), long_name);
+          sys_warn (r, _("Duplicate long variable name `%s'."), long_name);
           continue;
         }