aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2006-11-10 20:52:00 +0000
committerJakub Jelinek <jakub@redhat.com>2006-11-10 20:52:00 +0000
commit53a451c64a34f4602b9479aaa8effe149e150a54 (patch)
tree767d1ef7ddc089f82c81d728dd51ad3279a670fb
parent8ee382621852ed3c7e5ff17609e69cdfc1ba5c9f (diff)
downloadglibc-53a451c64a34f4602b9479aaa8effe149e150a54.tar
glibc-53a451c64a34f4602b9479aaa8effe149e150a54.tar.gz
glibc-53a451c64a34f4602b9479aaa8effe149e150a54.tar.bz2
glibc-53a451c64a34f4602b9479aaa8effe149e150a54.zip
Updated to fedora-glibc-20061110T2049cvs/fedora-glibc-2_5_90-6
-rw-r--r--elf/cache.c2
-rw-r--r--elf/ldconfig.c2
-rw-r--r--fedora/branch.mk4
-rw-r--r--locale/programs/charmap.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.c2
-rw-r--r--nis/nss_nisplus/nisplus-publickey.c2
-rw-r--r--nscd/selinux.c2
-rw-r--r--sunrpc/clnt_raw.c2
-rw-r--r--sunrpc/pm_getmaps.c2
-rw-r--r--sysdeps/i386/fpu/bits/mathinline.h30
14 files changed, 34 insertions, 32 deletions
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/ldconfig.c b/elf/ldconfig.c
index 0716a2acb8..3f6aabbc26 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/fedora/branch.mk b/fedora/branch.mk
index 1762b85308..22d6a26f35 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -3,5 +3,5 @@ glibc-branch := fedora
glibc-base := HEAD
DIST_BRANCH := devel
COLLECTION := dist-fc4
-fedora-sync-date := 2006-11-10 19:56 UTC
-fedora-sync-tag := fedora-glibc-20061110T1956
+fedora-sync-date := 2006-11-10 20:49 UTC
+fedora-sync-tag := fedora-glibc-20061110T2049
diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c
index 52a69de4b0..592d29e916 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,7 +1019,7 @@ 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;
}
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..c96cf0425a 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;
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/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/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/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__