[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r12757 - in /fsf/trunk/libc: ./ elf/ nis/ posix/ sysdeps/x86_64/multiarch/
- To: commits@xxxxxxxxxx
- Subject: [commits] r12757 - in /fsf/trunk/libc: ./ elf/ nis/ posix/ sysdeps/x86_64/multiarch/
- From: eglibc@xxxxxxxxxx
- Date: Sat, 05 Feb 2011 08:02:58 -0000
Author: eglibc
Date: Sat Feb 5 00:02:55 2011
New Revision: 12757
Log:
Import glibc-mainline for 2011-02-05
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/elf/dl-object.c
fsf/trunk/libc/nis/nis_add.c
fsf/trunk/libc/nis/nis_modify.c
fsf/trunk/libc/nis/nis_remove.c
fsf/trunk/libc/nis/nis_server.c
fsf/trunk/libc/nis/nis_table.c
fsf/trunk/libc/posix/fnmatch_loop.c
fsf/trunk/libc/sysdeps/x86_64/multiarch/memset-x86-64.S
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Feb 5 00:02:55 2011
@@ -1,3 +1,17 @@
+2011-02-04 Roland McGrath <roland@xxxxxxxxxx>
+
+ * nis/nis_server.c (nis_servstate): Use the right name for 0.
+ (nis_stats): Likewise.
+ * nis/nis_modify.c (nis_modify): Likewise.
+ * nis/nis_remove.c (nis_remove): Likewise.
+ * nis/nis_add.c (nis_add): Likewise.
+
+ * elf/dl-object.c (_dl_new_object): Remove unused variable L.
+
+ * posix/fnmatch_loop.c: Add some consts.
+
+ * sysdeps/x86_64/multiarch/memset-x86-64.S: Add an #undef.
+
2011-02-02 H.J. Lu <hongjiu.lu@xxxxxxxxx>
[BZ #12460]
Modified: fsf/trunk/libc/elf/dl-object.c
==============================================================================
--- fsf/trunk/libc/elf/dl-object.c (original)
+++ fsf/trunk/libc/elf/dl-object.c Sat Feb 5 00:02:55 2011
@@ -1,5 +1,6 @@
/* Storage management for the chain of loaded shared objects.
- Copyright (C) 1995-2002,2004,2006-2009,2010 Free Software Foundation, Inc.
+ Copyright (C) 1995-2002,2004,2006,2007,2008,2009,2010,2011
+ 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
@@ -60,7 +61,6 @@
_dl_new_object (char *realname, const char *libname, int type,
struct link_map *loader, int mode, Lmid_t nsid)
{
- struct link_map *l;
size_t libname_len = strlen (libname) + 1;
struct link_map *new;
struct libname_list *newname;
Modified: fsf/trunk/libc/nis/nis_add.c
==============================================================================
--- fsf/trunk/libc/nis/nis_add.c (original)
+++ fsf/trunk/libc/nis/nis_add.c Sat Feb 5 00:02:55 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,2004,2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@xxxxxxxxxxxxxxxx>, 1997.
@@ -65,7 +65,7 @@
NIS_ADD, (xdrproc_t) _xdr_ns_request,
(caddr_t) &req, (xdrproc_t) _xdr_nis_result,
(caddr_t) res, MASTER_ONLY, NULL);
- if (status != RPC_SUCCESS)
+ if (status != NIS_SUCCESS)
NIS_RES_STATUS (res) = status;
nis_destroy_object (req.ns_object.ns_object_val);
Modified: fsf/trunk/libc/nis/nis_modify.c
==============================================================================
--- fsf/trunk/libc/nis/nis_modify.c (original)
+++ fsf/trunk/libc/nis/nis_modify.c Sat Feb 5 00:02:55 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,2004,2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@xxxxxxxxxxxxxxxx>, 1997.
@@ -65,7 +65,7 @@
(caddr_t) & req, (xdrproc_t) _xdr_nis_result,
(caddr_t) res, MASTER_ONLY,
NULL);
- if (status != RPC_SUCCESS)
+ if (status != NIS_SUCCESS)
NIS_RES_STATUS (res) = status;
nis_destroy_object (req.ns_object.ns_object_val);
Modified: fsf/trunk/libc/nis/nis_remove.c
==============================================================================
--- fsf/trunk/libc/nis/nis_remove.c (original)
+++ fsf/trunk/libc/nis/nis_remove.c Sat Feb 5 00:02:55 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,2004,2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@xxxxxxxxxxxxxxxx>, 1997.
@@ -49,7 +49,7 @@
if ((status = __do_niscall (name, NIS_REMOVE, (xdrproc_t) _xdr_ns_request,
(caddr_t) &req, (xdrproc_t) _xdr_nis_result,
(caddr_t) res, MASTER_ONLY,
- NULL)) != RPC_SUCCESS)
+ NULL)) != NIS_SUCCESS)
NIS_RES_STATUS (res) = status;
nis_destroy_object (req.ns_object.ns_object_val);
Modified: fsf/trunk/libc/nis/nis_server.c
==============================================================================
--- fsf/trunk/libc/nis/nis_server.c (original)
+++ fsf/trunk/libc/nis/nis_server.c Sat Feb 5 00:02:55 2011
@@ -1,4 +1,4 @@
-/* Copyright (c) 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (c) 1997,1998,2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@xxxxxxxxxxxxxxxxxxx>, 1997.
@@ -41,7 +41,7 @@
if (__do_niscall2 (serv, 1, NIS_SERVSTATE, (xdrproc_t) _xdr_nis_taglist,
(caddr_t) &taglist, (xdrproc_t) _xdr_nis_taglist,
- (caddr_t) &tagres, 0, NULL) != RPC_SUCCESS)
+ (caddr_t) &tagres, 0, NULL) != NIS_SUCCESS)
return NIS_RPCERROR;
*result = tagres.tags.tags_val;
@@ -67,7 +67,7 @@
if (__do_niscall2 (serv, 1, NIS_STATUS, (xdrproc_t) _xdr_nis_taglist,
(caddr_t) &taglist, (xdrproc_t) _xdr_nis_taglist,
- (caddr_t) &tagres, 0, NULL) != RPC_SUCCESS)
+ (caddr_t) &tagres, 0, NULL) != NIS_SUCCESS)
return NIS_RPCERROR;
*result = tagres.tags.tags_val;
Modified: fsf/trunk/libc/nis/nis_table.c
==============================================================================
--- fsf/trunk/libc/nis/nis_table.c (original)
+++ fsf/trunk/libc/nis/nis_table.c Sat Feb 5 00:02:55 2011
@@ -1,5 +1,5 @@
-/* Copyright (c) 1997-1999, 2003, 2004, 2005, 2006, 2007
- Free Software Foundation, Inc.
+/* Copyright (c) 1997-1999, 2003, 2004, 2005, 2006, 2007, 2011
+ Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@xxxxxxx>, 1997.
Modified: fsf/trunk/libc/posix/fnmatch_loop.c
==============================================================================
--- fsf/trunk/libc/posix/fnmatch_loop.c (original)
+++ fsf/trunk/libc/posix/fnmatch_loop.c Sat Feb 5 00:02:55 2011
@@ -235,8 +235,8 @@
case L('['):
{
/* Nonzero if the sense of the character class is inverted. */
- CHAR *p_init = p;
- CHAR *n_init = n;
+ const CHAR *p_init = p;
+ const CHAR *n_init = n;
register int not;
CHAR cold;
UCHAR fn;
Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/memset-x86-64.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/memset-x86-64.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/memset-x86-64.S Sat Feb 5 00:02:55 2011
@@ -12,6 +12,7 @@
# define END_CHK(name) \
cfi_endproc; .size __memset_chk_x86_64, .-__memset_chk_x86_64
+# undef libc_hidden_builtin_def
# define libc_hidden_builtin_def(name)
# define memset __memset_x86_64
# include "../memset.S"