[BZ #3465]

	* sunrpc/clnt_raw.c: Minimal message improvements.
	* sunrpc/pm_getmaps.c: Likewise.
	* nis/nss_nisplus/nisplus-publickey.c: Likewise.
	* nis/nis_print_group_entry.c: Likewise.
	* locale/programs/repertoire.c: Likewise.
	* locale/programs/charmap.c: Likewise.
	* malloc/memusage.sh: Likewise.
	* elf/dl-deps.c: Likewise.
	* locale/programs/ld-collate.c: Likewise.
	* libio/vswprintf.c: Likewise.
	* malloc/memusagestat.c: Likewise.
	* sunrpc/auth_unix.c: Likewise.
	* sunrpc/rpc_main.c: Likewise.
	* nscd/cache.c: Likewise.
	* locale/programs/repertoire.c: Unify output messages.
	* locale/programs/charmap.c: Likewise.
	* locale/programs/ld-ctype.c: Likewise.
	* locale/programs/ld-monetary.c: Likewise.
	* locale/programs/ld-numeric.c: Likewise.
	* locale/programs/ld-time.c: Likewise.
	* elf/ldconfig.c: Likewise.
	* nscd/selinux.c: Likewise.
	* elf/cache.c: Likewise.
	Patch mostly by Benno Schulenberg <bensberg@justemail.net>.

diff --git a/ChangeLog b/ChangeLog
index 37effa8e183e1942ffeab7c35e396590b18d8477..0c973aa407420e46bf0dd4fef3e162789e5cc533 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,31 @@
 2006-11-10  Ulrich Drepper  <drepper@redhat.com>
 
+       [BZ #3465]
+       * sunrpc/clnt_raw.c: Minimal message improvements.
+       * sunrpc/pm_getmaps.c: Likewise.
+       * nis/nss_nisplus/nisplus-publickey.c: Likewise.
+       * nis/nis_print_group_entry.c: Likewise.
+       * locale/programs/repertoire.c: Likewise.
+       * locale/programs/charmap.c: Likewise.
+       * malloc/memusage.sh: Likewise.
+       * elf/dl-deps.c: Likewise.
+       * locale/programs/ld-collate.c: Likewise.
+       * libio/vswprintf.c: Likewise.
+       * malloc/memusagestat.c: Likewise.
+       * sunrpc/auth_unix.c: Likewise.
+       * sunrpc/rpc_main.c: Likewise.
+       * nscd/cache.c: Likewise.
+       * locale/programs/repertoire.c: Unify output messages.
+       * locale/programs/charmap.c: Likewise.
+       * locale/programs/ld-ctype.c: Likewise.
+       * locale/programs/ld-monetary.c: Likewise.
+       * locale/programs/ld-numeric.c: Likewise.
+       * locale/programs/ld-time.c: Likewise.
+       * elf/ldconfig.c: Likewise.
+       * nscd/selinux.c: Likewise.
+       * elf/cache.c: Likewise.
+       Patch mostly by Benno Schulenberg <bensberg@justemail.net>.
+
        [BZ #3451]
        * sysdeps/i386/fpu/bits/mathinline.h (floor): Make rounding mode
        change atomic.

diff --git a/elf/cache.c b/elf/cache.c
index 6730fb36eb5103d62b7d3ba92746a83897b99f8c..e18446644e5f2ad5c2d7ebcd334a896b1f0561d6 100644 (file)
--- a/elf/cache.c
+++ b/elf/cache.c
@@ -439,7 +439,7 @@ save_cache (const char *cache_name)
     }
 
   if (write (fd, strings, total_strlen) != (ssize_t) total_strlen)
-    error (EXIT_FAILURE, errno, _("Writing of cache data failed."));
+    error (EXIT_FAILURE, errno, _("Writing of cache data failed"));
 
   close (fd);
 

diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index c35cc977fa5f2363cd7047dd2eb8d9f08bd3deb1..4ec984e15bc0fa4a45976eb45c7a82f5cdc56672 100644 (file)
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -123,7 +123,7 @@ DST not allowed in SUID/SGID programs"));                                 \
               processed.  */                                                 \
            if (fatal)                                                        \
              _dl_signal_error (0, __str, NULL, N_("\
-empty dynamics string token substitution"));                                 \
+empty dynamic string token substitution"));                                  \
            else                                                              \
              {                                                               \
                /* This is for DT_AUXILIARY.  */                              \

diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index b14696d496e0e519936c9ffb9d6b0b4a0ddbef1a..1b64a9de8b2aebad9f4378e8e718bb579ee6f841 100644 (file)
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -558,7 +558,7 @@ manual_link (char *library)
   /* Do some sanity checks first.  */
   if (lstat64 (real_library, &stat_buf))
     {
-      error (0, errno, _("Can't lstat %s"), library);
+      error (0, errno, _("Cannot lstat %s"), library);
       free (path);
       return;
     }

diff --git a/libio/vswprintf.c b/libio/vswprintf.c
index 5bbd20227b15136f34bc5db3bf4c0ba9c341bda2..e9a316a01c1bf2f274cbabedf17a37cd3b8b3dd8 100644 (file)
--- a/libio/vswprintf.c
+++ b/libio/vswprintf.c
@@ -119,7 +119,7 @@ _IO_vswprintf (string, maxlen, format, args)
 
   if (sf.f._sbf._f._wide_data->_IO_buf_base == sf.overflow_buf)
     /* ISO C99 requires swprintf/vswprintf to return an error if the
-       output does not fit int he provided buffer.  */
+       output does not fit in the provided buffer.  */
     return -1;
 
   /* Terminate the string.  */

diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c
index 52a69de4b04a593c9195b3eb1703f4bb47912776..dbc1101fd07fb4ed175ba5bb8bb7c426c053f7a5 100644 (file)
--- a/locale/programs/charmap.c
+++ b/locale/programs/charmap.c
@@ -607,7 +607,7 @@ character sets with locking states are not supported"));
        case 90:
          if (nowtok != expected_tok)
            lr_error (cmfile, _("\
-`%1$s' definition does not end with `END %1$s'"), expected_str);
+%1$s: definition does not end with `END %1$s'"), expected_str);
 
          lr_ignore_rest (cmfile, nowtok == expected_tok);
          state = 91;
@@ -1019,13 +1019,13 @@ hexadecimal range format should use only capital characters"));
          && errno == ERANGE)
       || *to_end != '\0')
     {
-      lr_error (lr, _("<%s> and <%s> are illegal names for range"), from, to);
+      lr_error (lr, _("<%s> and <%s> are invalid names for range"), from, to);
       return;
     }
 
   if (from_nr > to_nr)
     {
-      lr_error (lr, _("upper limit in range is not higher then lower limit"));
+      lr_error (lr, _("upper limit in range is smaller than lower limit"));
       return;
     }
 

diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index cf1bff130f250acaaf12ebe372c724ef0bff6310..af472799585d5c7c79121473ab9e2d1354ae290a 100644 (file)
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -1146,7 +1146,7 @@ handle_ellipsis (struct linereader *ldfile, const char *symstr, size_t symlen,
            {
              if (ret > 0)
                lr_error (ldfile, _("%s: byte sequence of first character of \
-sequence is not lower than that of the last character"), "LC_COLLATE");
+range is not lower than that of the last character"), "LC_COLLATE");
              return;
            }
 
@@ -1164,7 +1164,7 @@ sequence is not lower than that of the last character"), "LC_COLLATE");
                  struct element_t *elem;
                  size_t namelen;
 
-                 /* I don't this this can ever happen.  */
+                 /* I don't think this can ever happen.  */
                  assert (seq->name != NULL);
                  namelen = strlen (seq->name);
 

diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
index ca1ec7995aed4ade770f96b5fa4921bfbcf721fa..69fc05f4ee86eea8d8aabe61d9bb389d229bf118 100644 (file)
--- a/locale/programs/ld-ctype.c
+++ b/locale/programs/ld-ctype.c
@@ -3036,7 +3036,7 @@ set_class_defaults (struct locale_ctype_t *ctype,
            {
              if (!be_quiet)
                WITH_CUR_LOCALE (error (0, 0, _("\
-%s: character `%s' not defined in charmap while needed as default value"),
+%s: character `%s' not defined while needed as default value"),
                                        "LC_CTYPE", tmp));
            }
          else if (seq->nbytes != 1)
@@ -3161,8 +3161,8 @@ set_class_defaults (struct locale_ctype_t *ctype,
        {
          if (!be_quiet)
            WITH_CUR_LOCALE (error (0, 0, _("\
-character `%s' not defined while needed as default value"),
-                                   "<newline>"));
+%s: character `%s' not defined while needed as default value"),
+                                   "LC_CTYPE", "<newline>"));
        }
       else if (seq->nbytes != 1)
        WITH_CUR_LOCALE (error (0, 0, _("\

diff --git a/locale/programs/ld-monetary.c b/locale/programs/ld-monetary.c
index 27636d6498183618224fb39f5b3ce259e18fa048..d493a142b568f1b8ebad9ea236fff692936cfc67 100644 (file)
--- a/locale/programs/ld-monetary.c
+++ b/locale/programs/ld-monetary.c
@@ -252,7 +252,7 @@ not correspond to a valid name in ISO 4217"),
   else if (monetary->mon_decimal_point[0] == '\0' && ! be_quiet && ! nothing)
     {
       WITH_CUR_LOCALE (error (0, 0, _("\
-%s: value for field `%s' must not be the empty string"),
+%s: value for field `%s' must not be an empty string"),
                              "LC_MONETARY", "mon_decimal_point"));
     }
   if (monetary->mon_decimal_point_wc == L'\0')

diff --git a/locale/programs/ld-numeric.c b/locale/programs/ld-numeric.c
index a901c4d98500b874a7724a8f644ca827ebb1960b..d7ffe75beef5fee95596fea7a47c09ad9f749cec 100644 (file)
--- a/locale/programs/ld-numeric.c
+++ b/locale/programs/ld-numeric.c
@@ -115,7 +115,7 @@ No definition for %s category found"), "LC_NUMERIC"));
   else if (numeric->decimal_point[0] == '\0' && ! be_quiet && ! nothing)
     {
       WITH_CUR_LOCALE (error (0, 0, _("\
-%s: value for field `%s' must not be the empty string"),
+%s: value for field `%s' must not be an empty string"),
                              "LC_NUMERIC", "decimal_point"));
     }
   if (numeric->decimal_point_wc == L'\0')

diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c
index bf5151858a797d977d7d43668b8c6990c4566084..0d193503718edcc930ea27da7759badb6fcce0d5 100644 (file)
--- a/locale/programs/ld-time.c
+++ b/locale/programs/ld-time.c
@@ -502,7 +502,7 @@ No definition for %s category found"), "LC_TIME"));
     time->first_weekday = 1;
   else if (time->first_weekday > time->week_ndays)
     WITH_CUR_LOCALE (error (0, 0, _("\
-%s: values of field `%s' must not be larger than %d"),
+%s: values for field `%s' must not be larger than %d"),
                            "LC_TIME", "first_weekday", 7));
 
   if (time->first_workday == '\0')
@@ -510,7 +510,7 @@ No definition for %s category found"), "LC_TIME"));
     time->first_workday = 1;
   else if (time->first_workday > time->week_ndays)
     WITH_CUR_LOCALE (error (0, 0, _("\
-%s: values of field `%s' must not be larger than %d"),
+%s: values for field `%s' must not be larger than %d"),
                            "LC_TIME", "first_workday", 7));
 
   if (time->cal_direction == '\0')

diff --git a/locale/programs/repertoire.c b/locale/programs/repertoire.c
index e9bdf9e7baae26f3c9cf5dbb6bdadb13271e1cdb..b6c0a6ad58ba52d4181734f5322ab91fc6e592db 100644 (file)
--- a/locale/programs/repertoire.c
+++ b/locale/programs/repertoire.c
@@ -311,7 +311,7 @@ argument to <%s> must be a single character"),
        case 90:
          if (nowtok != tok_charids)
            lr_error (repfile, _("\
-`%1$s' definition does not end with `END %1$s'"), "CHARIDS");
+%1$s: definition does not end with `END %1$s'"), "CHARIDS");
 
          lr_ignore_rest (repfile, nowtok == tok_charids);
          break;
@@ -453,7 +453,7 @@ hexadecimal range format should use only capital characters"));
 
   if (from_nr > to_nr)
     {
-      lr_error (lr, _("upper limit in range is not smaller then lower limit"));
+      lr_error (lr, _("upper limit in range is smaller than lower limit"));
       return;
     }
 

diff --git a/malloc/memusage.sh b/malloc/memusage.sh
index ecc935d0376d138bb77732912091c29fee4d860e..ad833523f2688afdfbaba69362536195416be70d 100755 (executable)
--- a/malloc/memusage.sh
+++ b/malloc/memusage.sh
@@ -44,7 +44,7 @@ Profile memory usage of PROGRAM.
    -d,--data=FILE         Generate binary data file and store it in FILE
    -u,--unbuffered        Don't buffer output
    -b,--buffer=SIZE       Collect SIZE entries before writing them out
-      --no-timer          Don't collect additional information though timer
+      --no-timer          Don't collect additional information through timer
    -m,--mmap              Also trace mmap & friends
 
    -?,--help              Print this help and exit

diff --git a/malloc/memusagestat.c b/malloc/memusagestat.c
index 5d35ee0236e8e25d75917bc799bee823a8fa7aad..d8fc71b72925523cd125ec1c60f28e5b65f027b6 100644 (file)
--- a/malloc/memusagestat.c
+++ b/malloc/memusagestat.c
@@ -55,8 +55,8 @@ static const struct argp_option options[] =
   { "time", 't', NULL, 0, N_("Generate output linear to time (default is linear to number of function calls)") },
   { "total", 'T', NULL, 0,
     N_("Also draw graph for total memory consumption") },
-  { "x-size", 'x', "VALUE", 0, N_("make output graphic VALUE pixel wide") },
-  { "y-size", 'y', "VALUE", 0, N_("make output graphic VALUE pixel high") },
+  { "x-size", 'x', "VALUE", 0, N_("Make output graphic VALUE pixels wide") },
+  { "y-size", 'y', "VALUE", 0, N_("Make output graphic VALUE pixels high") },
   { NULL, 0, NULL, 0, NULL }
 };
 

diff --git a/nis/nis_print_group_entry.c b/nis/nis_print_group_entry.c
index 91e6399b9045130248890bb2c0170d19fb88b134..11680ae7dc618f73322118d3ba3e125543c868e3 100644 (file)
--- a/nis/nis_print_group_entry.c
+++ b/nis/nis_print_group_entry.c
@@ -162,7 +162,7 @@ nis_print_group_entry (const_nis_name group)
        fputs (_("    No implicit nonmembers\n"), stdout);
       if (nomem_rec_cnt)
        {
-         fputs (_("    Explicit nonmembers:\n"), stdout);
+         fputs (_("    Recursive nonmembers:\n"), stdout);
          for (i = 0; i < nomem_rec_cnt; ++i)
            printf ("\t%s=n", &nomem_rec[i][2]);
        }

diff --git a/nis/nss_nisplus/nisplus-publickey.c b/nis/nss_nisplus/nisplus-publickey.c
index f6b32f8827dfde5f1356677399889fcb0b570e38..14e7d41dbe6106070b4ff0838a631de0948a2599 100644 (file)
--- a/nis/nss_nisplus/nisplus-publickey.c
+++ b/nis/nss_nisplus/nisplus-publickey.c
@@ -217,7 +217,7 @@ parse_grp_str (const char *s, gid_t *gidp, int *gidlenp, gid_t *gidlist,
 
   if (!s || (!isdigit (*s)))
     {
-      syslog (LOG_ERR, _("netname2user: missing group id list in `%s'."), s);
+      syslog (LOG_ERR, _("netname2user: missing group id list in `%s'"), s);
       return NSS_STATUS_NOTFOUND;
     }
 

diff --git a/nscd/cache.c b/nscd/cache.c
index be9be2aa4f1e2e8597f9ea91bb3b14f05bf7e61c..ef986f374adec3648f432c399285f6d912bd7a68 100644 (file)
--- a/nscd/cache.c
+++ b/nscd/cache.c
@@ -125,7 +125,7 @@ cache_add (int type, const void *key, size_t len, struct datahead *packet,
 
       dbg_log (_("add new entry \"%s\" of type %s for %s to cache%s"),
               str, serv2str[type], dbnames[table - dbs],
-              first ? " (first)" : "");
+              first ? _(" (first)") : "");
     }
 
   unsigned long int hash = __nis_hash (key, len) % table->head->module;

diff --git a/nscd/selinux.c b/nscd/selinux.c
index f123d68b933b9c8e65aefd37b73775f2ba0a76f5..f0620d10128973bdeae016a0367a586f84647b72 100644 (file)
--- a/nscd/selinux.c
+++ b/nscd/selinux.c
@@ -202,7 +202,7 @@ preserve_capabilities (void)
   if (__builtin_expect (res != 0, 0))
     {
       cap_free (new_caps);
-      dbg_log (_("Failed to drop capabilities\n"));
+      dbg_log (_("Failed to drop capabilities"));
       error (EXIT_FAILURE, 0, _("cap_set_proc failed"));
     }
 

diff --git a/sunrpc/auth_unix.c b/sunrpc/auth_unix.c
index 1740e58cdcd45baae231eadbba67ea7245aa7e0a..3eaf0a25ab80411d0c9c7cc8dccc52bf44d4fd7c 100644 (file)
--- a/sunrpc/auth_unix.c
+++ b/sunrpc/auth_unix.c
@@ -347,7 +347,7 @@ marshal_new_auth (AUTH *auth)
   INTUSE(xdrmem_create) (xdrs, au->au_marshed, MAX_AUTH_BYTES, XDR_ENCODE);
   if ((!INTUSE(xdr_opaque_auth) (xdrs, &(auth->ah_cred))) ||
       (!INTUSE(xdr_opaque_auth) (xdrs, &(auth->ah_verf))))
-    perror (_("auth_none.c - Fatal marshalling problem"));
+    perror (_("auth_unix.c: Fatal marshalling problem"));
   else
     au->au_mpos = XDR_GETPOS (xdrs);
 

diff --git a/sunrpc/clnt_raw.c b/sunrpc/clnt_raw.c
index 019f1bbae05f31365dda3b4a5e3bc3f3d686d59b..44ea03efb7ca38a7db9460563220993f1aac7b29 100644 (file)
--- a/sunrpc/clnt_raw.c
+++ b/sunrpc/clnt_raw.c
@@ -114,7 +114,7 @@ clntraw_create (u_long prog, u_long vers)
   INTUSE(xdrmem_create) (xdrs, clp->mashl_callmsg, MCALL_MSG_SIZE, XDR_ENCODE);
   if (!INTUSE(xdr_callhdr) (xdrs, &call_msg))
     {
-      perror (_ ("clnt_raw.c - Fatal header serialization error."));
+      perror (_ ("clnt_raw.c: fatal header serialization error"));
     }
   clp->mcnt = XDR_GETPOS (xdrs);
   XDR_DESTROY (xdrs);

diff --git a/sunrpc/pm_getmaps.c b/sunrpc/pm_getmaps.c
index 2a6876d9d808b8e3665cab8585880ba1aa0c43bb..b21e7ea85cc04b8d42d35b7a5e476e91d1748280 100644 (file)
--- a/sunrpc/pm_getmaps.c
+++ b/sunrpc/pm_getmaps.c
@@ -80,7 +80,7 @@ pmap_getmaps (struct sockaddr_in *address)
                     (xdrproc_t)INTUSE(xdr_pmaplist), (caddr_t)&head,
                     minutetimeout) != RPC_SUCCESS)
        {
-         clnt_perror (client, _("pmap_getmaps rpc problem"));
+         clnt_perror (client, _("pmap_getmaps.c: rpc problem"));
        }
       CLNT_DESTROY (client);
     }

diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c
index 954657a7e4aad69e911a717dba8753e42c09c7d3..bda432d3cd0f2f1ac613687a569107d5a3d0e0f6 100644 (file)
--- a/sunrpc/rpc_main.c
+++ b/sunrpc/rpc_main.c
@@ -457,7 +457,7 @@ check_nettype (const char *name, const char *list_to_check[])
          return 1;
        }
     }
-  fprintf (stderr, _ ("illegal nettype :`%s'\n"), name);
+  fprintf (stderr, _ ("illegal nettype: `%s'\n"), name);
   return 0;
 }
 

diff --git a/sysdeps/i386/fpu/bits/mathinline.h b/sysdeps/i386/fpu/bits/mathinline.h
index 8e7a867ec63202ad93b0d17a03215e2cfb3193d7..28547d44b87b5251458669760436044165dd6020 100644 (file)
--- a/sysdeps/i386/fpu/bits/mathinline.h
+++ b/sysdeps/i386/fpu/bits/mathinline.h
@@ -532,16 +532,17 @@ __inline_mathcodeNP (floor, __x, \
   register int __ignore;                                                     \
   unsigned short int __cw;                                                   \
   unsigned short int __cwtmp;                                                \
-  __asm __volatile ("fnstcw %4\n\t"                                          \
-                   "movzwl %4, %1\n\t"                                       \
+  __asm __volatile ("fnstcw %3\n\t"                                          \
+                   "movzwl %3, %1\n\t"                                       \
                    "andl $0xf3ff, %1\n\t"                                    \
                    "orl $0x0400, %1\n\t"       /* rounding down */           \
-                   "movw %1, %3\n\t"                                         \
-                   "fldcw %3\n\t"                                            \
+                   "movw %w1, %2\n\t"                                        \
+                   "fldcw %2\n\t"                                            \
                    "frndint\n\t"                                             \
-                   "fldcw %4"                                                \
-                   : "=t" (__value), "=&q" (__ignore)                        \
-                   : "0" (__x), "m" (__cwtmp), "m" (__cw));                  \
+                   "fldcw %3"                                                \
+                   : "=t" (__value), "=&q" (__ignore), "=m" (__cwtmp),       \
+                     "=m" (__cw)                                             \
+                   : "0" (__x));                                             \
   return __value)
 
 __inline_mathcodeNP (ceil, __x, \
@@ -549,16 +550,17 @@ __inline_mathcodeNP (ceil, __x, \
   register int __ignore;                                                     \
   unsigned short int __cw;                                                   \
   unsigned short int __cwtmp;                                                \
-  __asm __volatile ("fnstcw %4\n\t"                                          \
-                   "movzwl %4, %1\n\t"                                       \
+  __asm __volatile ("fnstcw %3\n\t"                                          \
+                   "movzwl %3, %1\n\t"                                       \
                    "andl $0xf3ff, %1\n\t"                                    \
                    "orl $0x0800, %1\n\t"       /* rounding up */             \
-                   "movw %1, %3\n\t"                                         \
-                   "fldcw %3\n\t"                                            \
+                   "movw %w1, %2\n\t"                                        \
+                   "fldcw %2\n\t"                                            \
                    "frndint\n\t"                                             \
-                   "fldcw %4"                                                \
-                   : "=t" (__value), "=&q" (__ignore)                        \
-                   : "0" (__x), "m" (__cwtmp), "m" (__cw));                  \
+                   "fldcw %3"                                                \
+                   : "=t" (__value), "=&q" (__ignore), "=m" (__cwtmp),       \
+                     "=m" (__cw)                                             \
+                   : "0" (__x));                                             \
   return __value)
 
 #ifdef __FAST_MATH__