about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-10-02 09:36:32 +0000
committerUlrich Drepper <drepper@redhat.com>2003-10-02 09:36:32 +0000
commit0d297437293d04e0f566215108ddedf527715326 (patch)
tree5043864c266adbe3c0645264b695e193b46cd35f
parent6a31ae84dcee538ac358195992331c858e26c486 (diff)
downloadglibc-0d297437293d04e0f566215108ddedf527715326.tar.gz
glibc-0d297437293d04e0f566215108ddedf527715326.tar.xz
glibc-0d297437293d04e0f566215108ddedf527715326.zip
Update.
2003-10-02  Ulrich Drepper  <drepper@redhat.com>

	* inet/getnameinfo.c: Move domain out of nrl_domainname scope and
	define it with libc_freeres_ptr.
-rw-r--r--ChangeLog5
-rw-r--r--inet/getnameinfo.c3
-rw-r--r--linuxthreads/ChangeLog5
-rw-r--r--linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h22
4 files changed, 23 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 755a15277e..5536ed1877 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-02  Ulrich Drepper  <drepper@redhat.com>
+
+	* inet/getnameinfo.c: Move domain out of nrl_domainname scope and
+	define it with libc_freeres_ptr.
+
 2003-10-01  Roland McGrath  <roland@redhat.com>
 
 	* elf/rtld.c (dl_main): Add cast in last change.
diff --git a/inet/getnameinfo.c b/inet/getnameinfo.c
index 50197f8672..d735bbf9ea 100644
--- a/inet/getnameinfo.c
+++ b/inet/getnameinfo.c
@@ -55,12 +55,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # define min(x,y) (((x) > (y)) ? (y) : (x))
 #endif /* min */
 
+libc_freeres_ptr (static char *domain);
+
 
 static char *
 internal_function
 nrl_domainname (void)
 {
-  static char *domain;
   static int not_first;
 
   if (! not_first)
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 22e930554e..fc18d161fb 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-02  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Fix saving and
+	restoring of the old cancellation type.
+
 2003-09-10  Chris Demetriou  <cgd@broadcom.com>
 
 	* sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h: New file.
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
index e84c98d82c..fae701aefe 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
@@ -49,12 +49,12 @@
     jae SYSCALL_ERROR_LABEL;						      \
   L(pseudo_end):
 
-# define SAVE_OLDTYPE_0	movl %eax, %edx;
-# define SAVE_OLDTYPE_1	SAVE_OLDTYPE_0
-# define SAVE_OLDTYPE_2	pushl %eax;
-# define SAVE_OLDTYPE_3	SAVE_OLDTYPE_2
-# define SAVE_OLDTYPE_4	SAVE_OLDTYPE_2
-# define SAVE_OLDTYPE_5	SAVE_OLDTYPE_2
+# define SAVE_OLDTYPE_0	movl %eax, %ecx;
+# define SAVE_OLDTYPE_1	pushl %eax;
+# define SAVE_OLDTYPE_2	SAVE_OLDTYPE_1
+# define SAVE_OLDTYPE_3	SAVE_OLDTYPE_1
+# define SAVE_OLDTYPE_4	SAVE_OLDTYPE_1
+# define SAVE_OLDTYPE_5	SAVE_OLDTYPE_1
 
 # define PUSHCARGS_0	/* No arguments to push.  */
 # define DOCARGS_0	/* No arguments to frob.  */
@@ -100,11 +100,11 @@
 #  define CDISABLE	call __libc_disable_asynccancel
 # endif
 # define POPSTATE_0	pushl %eax; movl %ecx, %eax; CDISABLE; popl %eax;
-# define POPSTATE_1	POPSTATE_0
-# define POPSTATE_2	xchgl (%esp), %eax; CDISABLE; popl %eax;
-# define POPSTATE_3	POPSTATE_2
-# define POPSTATE_4	POPSTATE_2
-# define POPSTATE_5	POPSTATE_2
+# define POPSTATE_1	xchgl (%esp), %eax; CDISABLE; popl %eax;
+# define POPSTATE_2	POPSTATE_1
+# define POPSTATE_3	POPSTATE_1
+# define POPSTATE_4	POPSTATE_1
+# define POPSTATE_5	POPSTATE_1
 
 #if !defined NOT_IN_libc
 # define __local_multiple_threads __libc_multiple_threads