This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.14-503-g1d8f7dd
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 11 Nov 2011 18:29:19 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.14-503-g1d8f7dd
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 1d8f7ddc04a4782c1bf2d6f48ce40e7d57caa920 (commit)
via aaddc98c25727f896fc8ed36c5562dc46865dbe6 (commit)
from 95b7042bac3e2cfc6fef7aec6acc7d46dd50eba5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=1d8f7ddc04a4782c1bf2d6f48ce40e7d57caa920
commit 1d8f7ddc04a4782c1bf2d6f48ce40e7d57caa920
Merge: aaddc98 95b7042
Author: Ulrich Drepper <drepper@gmail.com>
Date: Fri Nov 11 13:29:12 2011 -0500
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
ChangeLog
diff --cc ChangeLog
index fe82103,33c7c9d..cfb381a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,8 +1,13 @@@
+2011-10-30 Marek Polacek <mpolacek@redhat.com>
+
+ * libio/wfileops.c (_IO_wfile_underflow_mmap): Remove unused variable.
+ * sysdeps/ieee754/dbl-64/mpsqrt.c (__mpsqrt): Likewise.
+
+ 2011-11-11 Roland McGrath <roland@hack.frob.com>
+
+ * include/unistd.h: Fix __readlink return type.
+ Reported by Chris Metcalf <cmetcalf@tilera.com>.
+
2011-11-11 Ulrich Drepper <drepper@gmail.com>
* stdlib/ucontext.h: Undo last change for makecontext.
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=aaddc98c25727f896fc8ed36c5562dc46865dbe6
commit aaddc98c25727f896fc8ed36c5562dc46865dbe6
Author: Marek Polacek <mpolacek@redhat.com>
Date: Fri Nov 11 13:27:59 2011 -0500
Remove unused variables
diff --git a/ChangeLog b/ChangeLog
index 60fb50c..fe82103 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-30 Marek Polacek <mpolacek@redhat.com>
+
+ * libio/wfileops.c (_IO_wfile_underflow_mmap): Remove unused variable.
+ * sysdeps/ieee754/dbl-64/mpsqrt.c (__mpsqrt): Likewise.
+
2011-11-11 Ulrich Drepper <drepper@gmail.com>
* stdlib/ucontext.h: Undo last change for makecontext.
diff --git a/libio/wfileops.c b/libio/wfileops.c
index 386b06b..8f21168 100644
--- a/libio/wfileops.c
+++ b/libio/wfileops.c
@@ -252,7 +252,7 @@ _IO_wfile_underflow (fp)
{
if (naccbuf != 0)
/* There are some bytes in the external buffer but they don't
- convert to anything. */
+ convert to anything. */
__set_errno (EILSEQ);
return WEOF;
}
@@ -340,7 +340,6 @@ static wint_t
_IO_wfile_underflow_mmap (_IO_FILE *fp)
{
struct _IO_codecvt *cd;
- enum __codecvt_result status;
const char *read_stop;
if (__builtin_expect (fp->_flags & _IO_NO_READS, 0))
@@ -379,12 +378,12 @@ _IO_wfile_underflow_mmap (_IO_FILE *fp)
fp->_wide_data->_IO_last_state = fp->_wide_data->_IO_state;
fp->_wide_data->_IO_read_base = fp->_wide_data->_IO_read_ptr =
fp->_wide_data->_IO_buf_base;
- status = (*cd->__codecvt_do_in) (cd, &fp->_wide_data->_IO_state,
- fp->_IO_read_ptr, fp->_IO_read_end,
- &read_stop,
- fp->_wide_data->_IO_read_ptr,
- fp->_wide_data->_IO_buf_end,
- &fp->_wide_data->_IO_read_end);
+ (*cd->__codecvt_do_in) (cd, &fp->_wide_data->_IO_state,
+ fp->_IO_read_ptr, fp->_IO_read_end,
+ &read_stop,
+ fp->_wide_data->_IO_read_ptr,
+ fp->_wide_data->_IO_buf_end,
+ &fp->_wide_data->_IO_read_end);
fp->_IO_read_ptr = (char *) read_stop;
@@ -513,9 +512,9 @@ _IO_wfile_sync (fp)
else
{
/* We have to find out the hard way how much to back off.
- To do this we determine how much input we needed to
- generate the wide characters up to the current reading
- position. */
+ To do this we determine how much input we needed to
+ generate the wide characters up to the current reading
+ position. */
int nread;
fp->_wide_data->_IO_state = fp->_wide_data->_IO_last_state;
@@ -625,8 +624,8 @@ _IO_wfile_seekoff (fp, offset, dir, mode)
case _IO_seek_cur:
/* Adjust for read-ahead (bytes is buffer). To do this we must
- find out which position in the external buffer corresponds to
- the current position in the internal buffer. */
+ find out which position in the external buffer corresponds to
+ the current position in the internal buffer. */
cv = fp->_codecvt;
clen = (*cv->__codecvt_do_encoding) (cv);
diff --git a/sysdeps/ieee754/dbl-64/mpsqrt.c b/sysdeps/ieee754/dbl-64/mpsqrt.c
index d1a80f9..f007cab 100644
--- a/sysdeps/ieee754/dbl-64/mpsqrt.c
+++ b/sysdeps/ieee754/dbl-64/mpsqrt.c
@@ -51,7 +51,7 @@ static double fastiroot(double);
void
SECTION
__mpsqrt(mp_no *x, mp_no *y, int p) {
- int i,m,ex,ey;
+ int i,m,ey;
double dx,dy;
mp_no
mphalf = {0,{0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,
@@ -66,7 +66,7 @@ __mpsqrt(mp_no *x, mp_no *y, int p) {
mphalf.e =0; mphalf.d[0] =ONE; mphalf.d[1] =HALFRAD;
mp3halfs.e=1; mp3halfs.d[0]=ONE; mp3halfs.d[1]=ONE; mp3halfs.d[2]=HALFRAD;
- ex=EX; ey=EX/2; __cpy(x,&mpxn,p); mpxn.e -= (ey+ey);
+ ey=EX/2; __cpy(x,&mpxn,p); mpxn.e -= (ey+ey);
__mp_dbl(&mpxn,&dx,p); dy=fastiroot(dx); __dbl_mp(dy,&mpu,p);
__mul(&mpxn,&mphalf,&mpz,p);
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
libio/wfileops.c | 25 ++++++++++++-------------
sysdeps/ieee754/dbl-64/mpsqrt.c | 4 ++--
3 files changed, 19 insertions(+), 15 deletions(-)
hooks/post-receive
--
GNU C Library master sources