summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-12-20 19:00:19 +0000
committerUlrich Drepper <drepper@redhat.com>2005-12-20 19:00:19 +0000
commit3d50529df98624014a5d38099e88b364dbaba257 (patch)
tree51037189f0d60cab46e9fcc5dd1b383027c4b827
parentcc2f0a2bb9d693cc44182f33f979e2628c99d75e (diff)
downloadglibc-3d50529df98624014a5d38099e88b364dbaba257.tar.gz
* sunrpc/auth_none.c (ops): Mark as const.
* nss/nsswitch.c (databases): Mark as const. Change name field into array. * nss/databases.def: Add warning.
-rw-r--r--ChangeLog6
-rw-r--r--nss/databases.def5
-rw-r--r--nss/nsswitch.c6
-rw-r--r--sunrpc/auth_none.c6
4 files changed, 15 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 80c8933d55..d081d02f59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-12-20 Ulrich Drepper <drepper@redhat.com>
+ * sunrpc/auth_none.c (ops): Mark as const.
+
+ * nss/nsswitch.c (databases): Mark as const. Change name field
+ into array.
+ * nss/databases.def: Add warning.
+
* resolv/res_hconf.c (arg_service_list): Reduce size of svcs and
mark const.
(cmd): Mark as const.
diff --git a/nss/databases.def b/nss/databases.def
index 27c15fc04f..c35d7f18c2 100644
--- a/nss/databases.def
+++ b/nss/databases.def
@@ -1,5 +1,5 @@
/* List of all databases defined for the NSS in GNU C Library.
- Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -18,7 +18,8 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-/* This list must be kept sorted!!! */
+/* This list must be kept sorted!!! If any long name is added the
+ field size for it must be increases. */
DEFINE_DATABASE (aliases)
DEFINE_DATABASE (ethers)
diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 895b17825a..7e5e6e8164 100644
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004
+/* Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -59,9 +59,9 @@ static service_library *nss_new_service (name_database *database,
#undef DEFINE_DATABASE
/* Structure to map database name to variable. */
-static struct
+static const struct
{
- const char *name;
+ const char name[10];
service_user **dbp;
} databases[] =
{
diff --git a/sunrpc/auth_none.c b/sunrpc/auth_none.c
index 9c4d3fde66..f459520a2c 100644
--- a/sunrpc/auth_none.c
+++ b/sunrpc/auth_none.c
@@ -49,7 +49,7 @@ static bool_t authnone_marshal (AUTH *, XDR *);
static bool_t authnone_validate (AUTH *, struct opaque_auth *);
static bool_t authnone_refresh (AUTH *);
-static struct auth_ops ops = {
+static const struct auth_ops ops = {
authnone_verf,
authnone_marshal,
authnone_validate,
@@ -80,7 +80,7 @@ authnone_create_once (void)
ap = &authnone_private;
ap->no_client.ah_cred = ap->no_client.ah_verf = _null_auth;
- ap->no_client.ah_ops = &ops;
+ ap->no_client.ah_ops = (struct auth_ops *) &ops;
xdrs = &xdr_stream;
INTUSE(xdrmem_create) (xdrs, ap->marshalled_client,
(u_int) MAX_MARSHAL_SIZE, XDR_ENCODE);
@@ -88,7 +88,7 @@ authnone_create_once (void)
(void) INTUSE(xdr_opaque_auth) (xdrs, &ap->no_client.ah_verf);
ap->mcnt = XDR_GETPOS (xdrs);
XDR_DESTROY (xdrs);
-}
+}
AUTH *
authnone_create (void)