aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-10-30 19:06:52 +0000
committerUlrich Drepper <drepper@redhat.com>2005-10-30 19:06:52 +0000
commit71b8b018ddb05c9f4a31d728c75019772bf79344 (patch)
tree0907baecb8950444f72eef8788a9457a89ed1b50
parentd935095e2ac1d06c63f9b48e7bb398d0d9da8c35 (diff)
downloadglibc-71b8b018ddb05c9f4a31d728c75019772bf79344.tar
glibc-71b8b018ddb05c9f4a31d728c75019772bf79344.tar.gz
glibc-71b8b018ddb05c9f4a31d728c75019772bf79344.tar.bz2
glibc-71b8b018ddb05c9f4a31d728c75019772bf79344.zip
* misc/hsearch_r.c (hsearch_r): Remove duplicate test.
Patch by Chris Caputo <ccaputo@alt.net>. 2005-10-28 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/unix/sh/sysdep.S: Remove unnecessary weak_alias. * sysdeps/unix/sysv/linux/sh/socket.S: Honor NO_WEAK_ALIAS.
-rw-r--r--ChangeLog10
-rw-r--r--misc/hsearch_r.c4
-rw-r--r--sysdeps/unix/sh/sysdep.S4
-rw-r--r--sysdeps/unix/sysv/linux/sh/socket.S8
4 files changed, 20 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index e7c27e0b35..fca946919b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-10-30 Ulrich Drepper <drepper@redhat.com>
+
+ * misc/hsearch_r.c (hsearch_r): Remove duplicate test.
+ Patch by Chris Caputo <ccaputo@alt.net>.
+
+2005-10-28 Kaz Kojima <kkojima@rr.iij4u.or.jp>
+
+ * sysdeps/unix/sh/sysdep.S: Remove unnecessary weak_alias.
+ * sysdeps/unix/sysv/linux/sh/socket.S: Honor NO_WEAK_ALIAS.
+
2005-10-28 Thorsten Kukuk <kukuk@suse.de>
* nis/nss_nis/nis-publickey.c (_nss_nis_getpublickey): Fix off
diff --git a/misc/hsearch_r.c b/misc/hsearch_r.c
index 398f0b6dd9..b03c12ce0b 100644
--- a/misc/hsearch_r.c
+++ b/misc/hsearch_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1993,1995,1996,1997,2002,2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1993.
@@ -206,7 +206,7 @@ hsearch_r (item, action, retval, htab)
{
/* If table is full and another entry should be entered return
with error. */
- if (action == ENTER && htab->filled == htab->size)
+ if (htab->filled == htab->size)
{
__set_errno (ENOMEM);
*retval = NULL;
diff --git a/sysdeps/unix/sh/sysdep.S b/sysdeps/unix/sh/sysdep.S
index 074b74333c..6e4798e45a 100644
--- a/sysdeps/unix/sh/sysdep.S
+++ b/sysdeps/unix/sh/sysdep.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -98,5 +98,3 @@ skip:
#endif
#endif
END(__syscall_error)
-
-weak_alias (__syscall_error, syscall_error)
diff --git a/sysdeps/unix/sysv/linux/sh/socket.S b/sysdeps/unix/sysv/linux/sh/socket.S
index f1369eb49b..eb1761b94b 100644
--- a/sysdeps/unix/sysv/linux/sh/socket.S
+++ b/sysdeps/unix/sysv/linux/sh/socket.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -33,7 +33,11 @@
The .S files for the other calls just #define socket and #include this. */
#ifndef __socket
+#ifndef NO_WEAK_ALIAS
#define __socket P(__,socket)
+#else
+#define __socket socket
+#endif
#endif
#define PUSHARGS_1 mov.l r4,@-r15; \
@@ -173,4 +177,6 @@ ENTRY (__socket)
PSEUDO_END (__socket)
+#ifndef NO_WEAK_ALIAS
weak_alias (__socket, socket)
+#endif