Remove unused variables

3 files changed, 19 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 60fb50ce54..fe82103e8f 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 386b06b79f..8f21168fb7 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 d1a80f9091..f007cab5d2 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);