Fix some warning nits.

9 files changed, 30 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 6b6e6ac202..e2cdc0dc21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2011-02-04  Roland McGrath  <roland@redhat.com>
+
+	* 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@intel.com>
 
 	[BZ #12460]
diff --git a/elf/dl-object.c b/elf/dl-object.c
index 5d15ce1869..b30c845a51 100644
--- a/elf/dl-object.c
+++ b/elf/dl-object.c
@@ -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 @@ internal_function
 _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;
diff --git a/nis/nis_add.c b/nis/nis_add.c
index f5e783cc2f..a06999b4e8 100644
--- a/nis/nis_add.c
+++ b/nis/nis_add.c
@@ -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@uni-paderborn.de>, 1997.
 
@@ -65,7 +65,7 @@ nis_add (const_nis_name name, const nis_object *obj2)
 			 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);
diff --git a/nis/nis_modify.c b/nis/nis_modify.c
index 0ec0ec6f42..68609fafea 100644
--- a/nis/nis_modify.c
+++ b/nis/nis_modify.c
@@ -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@uni-paderborn.de>, 1997.
 
@@ -65,7 +65,7 @@ nis_modify (const_nis_name name, const nis_object *obj2)
 			 (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);
diff --git a/nis/nis_remove.c b/nis/nis_remove.c
index 3aefccea44..4c91799072 100644
--- a/nis/nis_remove.c
+++ b/nis/nis_remove.c
@@ -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@uni-paderborn.de>, 1997.
 
@@ -49,7 +49,7 @@ nis_remove (const_nis_name name, const nis_object *obj)
   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);
diff --git a/nis/nis_server.c b/nis/nis_server.c
index c11f4b0328..718d7de239 100644
--- a/nis/nis_server.c
+++ b/nis/nis_server.c
@@ -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@vt.uni-paderborn.de>, 1997.
 
@@ -41,7 +41,7 @@ nis_servstate (const nis_server *serv, const nis_tag *tags,
 
   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 @@ nis_stats (const nis_server *serv, const nis_tag *tags,
 
   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;
diff --git a/nis/nis_table.c b/nis/nis_table.c
index 3704b0094e..aba2897320 100644
--- a/nis/nis_table.c
+++ b/nis/nis_table.c
@@ -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@suse.de>, 1997.
 
diff --git a/posix/fnmatch_loop.c b/posix/fnmatch_loop.c
index 5c15f46fd9..18a6667609 100644
--- a/posix/fnmatch_loop.c
+++ b/posix/fnmatch_loop.c
@@ -235,8 +235,8 @@ FCT (pattern, string, string_end, no_leading_period, flags, ends, alloca_used)
 	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;
diff --git a/sysdeps/x86_64/multiarch/memset-x86-64.S b/sysdeps/x86_64/multiarch/memset-x86-64.S
index 5e8cfb3e9b..551d105d21 100644
--- a/sysdeps/x86_64/multiarch/memset-x86-64.S
+++ b/sysdeps/x86_64/multiarch/memset-x86-64.S
@@ -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"