Update.

2002-07-24 Ulrich Drepper <drepper@redhat.com> * libio/fileops.c (_IO_file_seekoff_mmap): Do use fp->_offset to compute current position. * stdio-common/tst-fseek.c (main): Improve error messages. * libio/tst-freopen.c (main): Remove unused variable. * libio/fileops.c (_IO_file_seekoff_mmap): Set fp->_offset after succesful seek call. Simply error checking. 2002-07-25 Jakub Jelinek <jakub@redhat.com> * config.h.in: Use __ASSEMBLER__ test macro not ASSEMBLER. * sysdeps/ia64/fpu/libm_support.h: Likewise.
fira959 · Jul 25, 2002 · 78ce5a3 · 78ce5a3
1 parent 66bff40
commit 78ce5a3
Show file tree

Hide file tree

Showing 10 changed files with 107 additions and 95 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,20 @@
+2002-07-24  Ulrich Drepper  <drepper@redhat.com>
+
+	* libio/fileops.c (_IO_file_seekoff_mmap): Do use fp->_offset to
+	compute current position.
+
+	* stdio-common/tst-fseek.c (main): Improve error messages.
+
+	* libio/tst-freopen.c (main): Remove unused variable.
+
+	* libio/fileops.c (_IO_file_seekoff_mmap): Set fp->_offset after
+	succesful seek call.  Simply error checking.
+
+2002-07-25  Jakub Jelinek  <jakub@redhat.com>
+
+	* config.h.in: Use __ASSEMBLER__ test macro not ASSEMBLER.
+	* sysdeps/ia64/fpu/libm_support.h: Likewise.
+
 2002-07-19  Roland McGrath  <roland@frob.com>
 
 	* hurd/hurdsig.c (_hurdsig_getenv): Always return null if

diff --git a/config.h.in b/config.h.in
@@ -1,4 +1,4 @@
-#if !defined ASSEMBLER && !defined _ISOMAC && !defined __OPTIMIZE__
+#if !defined __ASSEMBLER__ && !defined _ISOMAC && !defined __OPTIMIZE__
 # error "glibc cannot be compiled without optimization"
 #endif
 

diff --git a/libio/fileops.c b/libio/fileops.c
@@ -932,8 +932,7 @@ _IO_file_seekoff_mmap (fp, offset, dir, mode)
      using a pushback buffer, but in the usual case has the same value as
      (fp->_IO_read_ptr - fp->_IO_buf_base).  */
   if (mode == 0)
-    return ((fp->_IO_buf_end - fp->_IO_buf_base)
-	    - (fp->_IO_read_end - fp->_IO_read_ptr));
+    return fp->_offset - (fp->_IO_read_end - fp->_IO_read_ptr);
 
   switch (dir)
     {

diff --git a/libio/tst-freopen.c b/libio/tst-freopen.c
@@ -23,10 +23,10 @@
 #include <string.h>
 #include <unistd.h>
 
-int main (void)
+int
+main (void)
 {
   char name[] = "/tmp/tst-freopen.XXXXXX";
-  char buf[4096];
   const char * const test = "Let's test freopen.\n";
   char temp[strlen (test) + 1];
   int fd = mkstemp (name);

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-25  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/i386/tls.h: Use __ASSEMBLER__ test macro not ASSEMBLER.
+	* sysdeps/i386/pt-machine.h: Likewise.
+	* sysdeps/i386/useldt.h: Likewise.
+
 2002-07-22  Ulrich Drepper  <drepper@redhat.com>
 
 	* pthread.c (__pthread_initialize_minimal): If !SHARED and TLS

diff --git a/linuxthreads/sysdeps/i386/pt-machine.h b/linuxthreads/sysdeps/i386/pt-machine.h
@@ -22,7 +22,7 @@
 #ifndef _PT_MACHINE_H
 #define _PT_MACHINE_H	1
 
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
 #ifndef PT_EI
 # define PT_EI extern inline
 #endif
@@ -103,6 +103,6 @@ compare_and_swap_is_available (void)
      Otherwise, it's a 486 or above and it has cmpxchg.  */
   return changed != 0;
 }
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */
 
 #endif /* pt-machine.h */
diff --git a/linuxthreads/sysdeps/i386/tls.h b/linuxthreads/sysdeps/i386/tls.h
@@ -22,7 +22,7 @@
 
 # include <pt-machine.h>
 
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
 # include <stddef.h>
 
 /* Type for the dtv.  */
@@ -49,7 +49,7 @@ typedef struct
 /* Signal that TLS support is available.  */
 # define USE_TLS	1
 
-# ifndef ASSEMBLER
+# ifndef __ASSEMBLER__
 /* Get system call information.  */
 #  include <sysdep.h>
 

diff --git a/linuxthreads/sysdeps/i386/useldt.h b/linuxthreads/sysdeps/i386/useldt.h
@@ -19,7 +19,7 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
 #include <stddef.h>	/* For offsetof.  */
 #include <stdlib.h>	/* For abort().  */