summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog26
-rw-r--r--elf/cache.c2
-rw-r--r--elf/dl-deps.c2
-rw-r--r--elf/ldconfig.c2
-rw-r--r--libio/vswprintf.c2
-rw-r--r--locale/programs/charmap.c6
-rw-r--r--locale/programs/ld-collate.c4
-rw-r--r--locale/programs/ld-ctype.c6
-rw-r--r--locale/programs/ld-monetary.c2
-rw-r--r--locale/programs/ld-numeric.c2
-rw-r--r--locale/programs/ld-time.c4
-rw-r--r--locale/programs/repertoire.c4
-rwxr-xr-xmalloc/memusage.sh2
-rw-r--r--malloc/memusagestat.c4
-rw-r--r--nis/nis_print_group_entry.c2
-rw-r--r--nis/nss_nisplus/nisplus-publickey.c2
-rw-r--r--nscd/cache.c2
-rw-r--r--nscd/selinux.c2
-rw-r--r--sunrpc/auth_unix.c2
-rw-r--r--sunrpc/clnt_raw.c2
-rw-r--r--sunrpc/pm_getmaps.c2
-rw-r--r--sunrpc/rpc_main.c2
-rw-r--r--sysdeps/i386/fpu/bits/mathinline.h30
23 files changed, 71 insertions, 43 deletions
diff --git a/ChangeLog b/ChangeLog
index 37effa8e18..0c973aa407 100644
--- 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 6730fb36eb..e18446644e 100644
--- 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 c35cc977fa..4ec984e15b 100644
--- 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 b14696d496..1b64a9de8b 100644
--- 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 5bbd20227b..e9a316a01c 100644
--- 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 52a69de4b0..dbc1101fd0 100644
--- 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 cf1bff130f..af47279958 100644
--- 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 ca1ec7995a..69fc05f4ee 100644
--- 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 27636d6498..d493a142b5 100644
--- 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 a901c4d985..d7ffe75bee 100644
--- 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 bf5151858a..0d19350371 100644
--- 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 e9bdf9e7ba..b6c0a6ad58 100644
--- 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 ecc935d037..ad833523f2 100755
--- 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 5d35ee0236..d8fc71b729 100644
--- 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 91e6399b90..11680ae7dc 100644
--- 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 f6b32f8827..14e7d41dbe 100644
--- 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 be9be2aa4f..ef986f374a 100644
--- 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 f123d68b93..f0620d1012 100644
--- 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 1740e58cdc..3eaf0a25ab 100644
--- 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 019f1bbae0..44ea03efb7 100644
--- 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 2a6876d9d8..b21e7ea85c 100644
--- 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 954657a7e4..bda432d3cd 100644
--- 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 8e7a867ec6..28547d44b8 100644
--- 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__
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-15 10:04:52 +0000