From fc9f33e33ffbb2d25eed7dc9e70f97b1abd82d37 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 26 Apr 2001 14:11:35 +0000 Subject: [PATCH] Update. * nss_nis/nis-alias.c: Likewise. * nss_nis/nis-ethers.c: Likewise. * nss_nis/nis-grp.c: Likewise. * nss_nis/nis-network.c: Likewise. * nss_nis/nis-proto.c: Likewise. * nss_nis/nis-pwd.c: Likewise. * nss_nis/nis-spwd.c: Likewise. * nss_compat/compat-grp.c: Likewise. * nss_compat/compat-initgroups.c: Likewise. * nss_compat/compat-pwd.c: Likewise. * nss_compat/compat-spwd.c: Likewise. --- ChangeLog | 11 +++++++++++ nis/nss_compat/compat-grp.c | 10 +++++----- nis/nss_compat/compat-initgroups.c | 10 +++++----- nis/nss_compat/compat-pwd.c | 10 +++++----- nis/nss_compat/compat-spwd.c | 10 +++++----- nis/nss_nis/nis-alias.c | 6 +++--- nis/nss_nis/nis-ethers.c | 6 +++--- nis/nss_nis/nis-grp.c | 6 +++--- nis/nss_nis/nis-network.c | 6 +++--- nis/nss_nis/nis-proto.c | 6 +++--- nis/nss_nis/nis-pwd.c | 6 +++--- nis/nss_nis/nis-spwd.c | 6 +++--- nis/nss_nisplus/nisplus-alias.c | 10 +++++----- nis/nss_nisplus/nisplus-ethers.c | 6 +++--- nis/nss_nisplus/nisplus-grp.c | 10 +++++----- nis/nss_nisplus/nisplus-hosts.c | 8 ++++---- nis/nss_nisplus/nisplus-network.c | 8 ++++---- nis/nss_nisplus/nisplus-proto.c | 8 ++++---- nis/nss_nisplus/nisplus-pwd.c | 8 ++++---- nis/nss_nisplus/nisplus-rpc.c | 8 ++++---- nis/nss_nisplus/nisplus-service.c | 8 ++++---- nis/nss_nisplus/nisplus-spwd.c | 8 ++++---- 22 files changed, 93 insertions(+), 82 deletions(-) diff --git a/ChangeLog b/ChangeLog index 38b42b360c..23a70f1cc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,17 @@ * nss_nisplus/nisplus-rpc.c: Likewise. * nss_nisplus/nisplus-service.c: Likewise. * nss_nisplus/nisplus-spwd.c: Likewise. + * nss_nis/nis-alias.c: Likewise. + * nss_nis/nis-ethers.c: Likewise. + * nss_nis/nis-grp.c: Likewise. + * nss_nis/nis-network.c: Likewise. + * nss_nis/nis-proto.c: Likewise. + * nss_nis/nis-pwd.c: Likewise. + * nss_nis/nis-spwd.c: Likewise. + * nss_compat/compat-grp.c: Likewise. + * nss_compat/compat-initgroups.c: Likewise. + * nss_compat/compat-pwd.c: Likewise. + * nss_compat/compat-spwd.c: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c: Some more optimizations. Patch by Jakub Jelinek . diff --git a/nis/nss_compat/compat-grp.c b/nis/nss_compat/compat-grp.c index d2fec68cc3..d05dbaebee 100644 --- a/nis/nss_compat/compat-grp.c +++ b/nis/nss_compat/compat-grp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1996. @@ -32,10 +32,10 @@ #include "nss-nisplus.h" #include "nisplus-parser.h" -static service_user *ni = NULL; -static bool_t use_nisplus = FALSE; /* default: group_compat: nis */ -static nis_name grptable = NULL; /* Name of the group table */ -static size_t grptablelen = 0; +static service_user *ni; +static bool_t use_nisplus; /* default: group_compat: nis */ +static nis_name grptable; /* Name of the group table */ +static size_t grptablelen; /* Get the declaration of the parser function. */ #define ENTNAME grent diff --git a/nis/nss_compat/compat-initgroups.c b/nis/nss_compat/compat-initgroups.c index 558433e0ba..171221ea45 100644 --- a/nis/nss_compat/compat-initgroups.c +++ b/nis/nss_compat/compat-initgroups.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1998. @@ -34,10 +34,10 @@ #include "nss-nisplus.h" #include "nisplus-parser.h" -static service_user *ni = NULL; -static bool_t use_nisplus = FALSE; /* default: group_compat: nis */ -static nis_name grptable = NULL; /* Name of the group table */ -static size_t grptablelen = 0; +static service_user *ni; +static bool_t use_nisplus; /* default: group_compat: nis */ +static nis_name grptable; /* Name of the group table */ +static size_t grptablelen; /* Get the declaration of the parser function. */ #define ENTNAME grent diff --git a/nis/nss_compat/compat-pwd.c b/nis/nss_compat/compat-pwd.c index 8540f5563a..5f031571f9 100644 --- a/nis/nss_compat/compat-pwd.c +++ b/nis/nss_compat/compat-pwd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1996. @@ -34,10 +34,10 @@ #include "nss-nisplus.h" #include "nisplus-parser.h" -static service_user *ni = NULL; -static bool_t use_nisplus = FALSE; /* default: passwd_compat: nis */ -static nis_name pwdtable = NULL; /* Name of the pwd table */ -static size_t pwdtablelen = 0; +static service_user *ni; +static bool_t use_nisplus; /* default: passwd_compat: nis */ +static nis_name pwdtable; /* Name of the pwd table */ +static size_t pwdtablelen; /* Get the declaration of the parser function. */ #define ENTNAME pwent diff --git a/nis/nss_compat/compat-spwd.c b/nis/nss_compat/compat-spwd.c index e184d79e6d..b3a7942143 100644 --- a/nis/nss_compat/compat-spwd.c +++ b/nis/nss_compat/compat-spwd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1996. @@ -34,10 +34,10 @@ #include "nss-nisplus.h" #include "nisplus-parser.h" -static service_user *ni = NULL; -static bool_t use_nisplus = FALSE; /* default: passwd_compat: nis */ -static nis_name pwdtable = NULL; /* Name of the password table */ -static size_t pwdtablelen = 0; +static service_user *ni; +static bool_t use_nisplus; /* default: passwd_compat: nis */ +static nis_name pwdtable; /* Name of the password table */ +static size_t pwdtablelen; /* Get the declaration of the parser function. */ #define ENTNAME spent diff --git a/nis/nss_nis/nis-alias.c b/nis/nss_nis/nis-alias.c index e6e2386547..459f7643e5 100644 --- a/nis/nss_nis/nis-alias.c +++ b/nis/nss_nis/nis-alias.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999i, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1996. @@ -31,8 +31,8 @@ __libc_lock_define_initialized (static, lock) static bool_t new_start = 1; -static char *oldkey = NULL; -static int oldkeylen = 0; +static char *oldkey; +static int oldkeylen; static int _nss_nis_parse_aliasent (const char *key, char *alias, struct aliasent *result, diff --git a/nis/nss_nis/nis-ethers.c b/nis/nss_nis/nis-ethers.c index 51c8534894..d5d6dbac51 100644 --- a/nis/nss_nis/nis-ethers.c +++ b/nis/nss_nis/nis-ethers.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1996-2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1996. @@ -44,8 +44,8 @@ struct response struct response *next; }; -static struct response *start = NULL; -static struct response *next = NULL; +static struct response *start; +static struct response *next; static int saveit (int instatus, char *inkey, int inkeylen, char *inval, diff --git a/nis/nss_nis/nis-grp.c b/nis/nss_nis/nis-grp.c index 72cf1b2747..f363f31523 100644 --- a/nis/nss_nis/nis-grp.c +++ b/nis/nss_nis/nis-grp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1996. @@ -38,8 +38,8 @@ __libc_lock_define_initialized (static, lock) static bool_t new_start = 1; -static char *oldkey = NULL; -static int oldkeylen = 0; +static char *oldkey; +static int oldkeylen; enum nss_status _nss_nis_setgrent (int stayopen) diff --git a/nis/nss_nis/nis-network.c b/nis/nss_nis/nis-network.c index ca02f01902..8b7b80c4a1 100644 --- a/nis/nss_nis/nis-network.c +++ b/nis/nss_nis/nis-network.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1996-2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1996. @@ -39,8 +39,8 @@ __libc_lock_define_initialized (static, lock) static bool_t new_start = 1; -static char *oldkey = NULL; -static int oldkeylen = 0; +static char *oldkey; +static int oldkeylen; enum nss_status _nss_nis_setnetent (int stayopen) diff --git a/nis/nss_nis/nis-proto.c b/nis/nss_nis/nis-proto.c index 33286df53a..debf5f8dc5 100644 --- a/nis/nss_nis/nis-proto.c +++ b/nis/nss_nis/nis-proto.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1996. @@ -41,8 +41,8 @@ struct response struct response *next; }; -static struct response *start = NULL; -static struct response *next = NULL; +static struct response *start; +static struct response *next; static int saveit (int instatus, char *inkey, int inkeylen, char *inval, diff --git a/nis/nss_nis/nis-pwd.c b/nis/nss_nis/nis-pwd.c index b818f08f05..b59d172095 100644 --- a/nis/nss_nis/nis-pwd.c +++ b/nis/nss_nis/nis-pwd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1996. @@ -38,8 +38,8 @@ __libc_lock_define_initialized (static, lock) static bool_t new_start = 1; -static char *oldkey = NULL; -static int oldkeylen = 0; +static char *oldkey; +static int oldkeylen; enum nss_status _nss_nis_setpwent (int stayopen) diff --git a/nis/nss_nis/nis-spwd.c b/nis/nss_nis/nis-spwd.c index d91f624db6..7d3a08ec9a 100644 --- a/nis/nss_nis/nis-spwd.c +++ b/nis/nss_nis/nis-spwd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1996. @@ -38,8 +38,8 @@ __libc_lock_define_initialized (static, lock) static bool_t new_start = 1; -static char *oldkey = NULL; -static int oldkeylen = 0; +static char *oldkey; +static int oldkeylen; enum nss_status _nss_nis_setspent (int stayopen) diff --git a/nis/nss_nisplus/nisplus-alias.c b/nis/nss_nisplus/nisplus-alias.c index a189d282ca..df27caa237 100644 --- a/nis/nss_nisplus/nisplus-alias.c +++ b/nis/nss_nisplus/nisplus-alias.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1997. @@ -29,10 +29,10 @@ __libc_lock_define_initialized (static, lock) -static nis_result *result = NULL; -static u_long next_entry = 0; -static nis_name tablename_val = NULL; -static u_long tablename_len = 0; +static nis_result *result; +static u_long next_entry; +static nis_name tablename_val; +static u_long tablename_len; #define NISENTRYVAL(idx,col,res) \ ((res)->objects.objects_val[(idx)].EN_data.en_cols.en_cols_val[(col)].ec_value.ec_value_val) diff --git a/nis/nss_nisplus/nisplus-ethers.c b/nis/nss_nisplus/nisplus-ethers.c index cbba2d39b5..7b79f38242 100644 --- a/nis/nss_nisplus/nisplus-ethers.c +++ b/nis/nss_nisplus/nisplus-ethers.c @@ -31,9 +31,9 @@ __libc_lock_define_initialized (static, lock) -static nis_result *result = NULL; -static nis_name tablename_val = NULL; -static u_long tablename_len = 0; +static nis_result *result; +static nis_name tablename_val; +static u_long tablename_len; #define NISENTRYVAL(idx,col,res) \ diff --git a/nis/nss_nisplus/nisplus-grp.c b/nis/nss_nisplus/nisplus-grp.c index 662d205acd..7f799a4f31 100644 --- a/nis/nss_nisplus/nisplus-grp.c +++ b/nis/nss_nisplus/nisplus-grp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997 Free Software Foundation, Inc. +/* Copyright (C) 1997, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1997. @@ -30,10 +30,10 @@ __libc_lock_define_initialized (static, lock); -static nis_result *result = NULL; -static unsigned long next_entry = 0; -static nis_name tablename_val = NULL; -static u_long tablename_len = 0; +static nis_result *result; +static unsigned long next_entry; +static nis_name tablename_val; +static u_long tablename_len; static enum nss_status _nss_create_tablename (int *errnop) diff --git a/nis/nss_nisplus/nisplus-hosts.c b/nis/nss_nisplus/nisplus-hosts.c index b2cb7a0f65..ad33e588a5 100644 --- a/nis/nss_nisplus/nisplus-hosts.c +++ b/nis/nss_nisplus/nisplus-hosts.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1997. @@ -31,9 +31,9 @@ __libc_lock_define_initialized (static, lock) -static nis_result *result = NULL; -static nis_name tablename_val = NULL; -static u_long tablename_len = 0; +static nis_result *result; +static nis_name tablename_val; +static u_long tablename_len; #define NISENTRYVAL(idx,col,res) \ ((res)->objects.objects_val[(idx)].EN_data.en_cols.en_cols_val[(col)].ec_value.ec_value_val) diff --git a/nis/nss_nisplus/nisplus-network.c b/nis/nss_nisplus/nisplus-network.c index adfb3c18e5..2a9c991b55 100644 --- a/nis/nss_nisplus/nisplus-network.c +++ b/nis/nss_nisplus/nisplus-network.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1997. @@ -31,9 +31,9 @@ __libc_lock_define_initialized (static, lock) -static nis_result *result = NULL; -static nis_name tablename_val = NULL; -static u_long tablename_len = 0; +static nis_result *result; +static nis_name tablename_val; +static u_long tablename_len; #define NISENTRYVAL(idx,col,res) \ ((res)->objects.objects_val[(idx)].EN_data.en_cols.en_cols_val[(col)].ec_value.ec_value_val) diff --git a/nis/nss_nisplus/nisplus-proto.c b/nis/nss_nisplus/nisplus-proto.c index 984530dcdd..befe6acb91 100644 --- a/nis/nss_nisplus/nisplus-proto.c +++ b/nis/nss_nisplus/nisplus-proto.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1997. @@ -29,9 +29,9 @@ __libc_lock_define_initialized (static, lock) -static nis_result *result = NULL; -static nis_name tablename_val = NULL; -static u_long tablename_len = 0; +static nis_result *result; +static nis_name tablename_val; +static u_long tablename_len; #define NISENTRYVAL(idx,col,res) \ ((res)->objects.objects_val[(idx)].EN_data.en_cols.en_cols_val[(col)].ec_value.ec_value_val) diff --git a/nis/nss_nisplus/nisplus-pwd.c b/nis/nss_nisplus/nisplus-pwd.c index 3ead9cda0d..d008f99e9f 100644 --- a/nis/nss_nisplus/nisplus-pwd.c +++ b/nis/nss_nisplus/nisplus-pwd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1999, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1997. @@ -29,9 +29,9 @@ __libc_lock_define_initialized (static, lock) -static nis_result *result = NULL; -static nis_name tablename_val = NULL; -static u_long tablename_len = 0; +static nis_result *result; +static nis_name tablename_val; +static u_long tablename_len; static enum nss_status _nss_create_tablename (int *errnop) diff --git a/nis/nss_nisplus/nisplus-rpc.c b/nis/nss_nisplus/nisplus-rpc.c index 6ba96422a9..75d200ae27 100644 --- a/nis/nss_nisplus/nisplus-rpc.c +++ b/nis/nss_nisplus/nisplus-rpc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1997. @@ -29,9 +29,9 @@ __libc_lock_define_initialized (static, lock) -static nis_result *result = NULL; -static nis_name tablename_val = NULL; -static u_long tablename_len = 0; +static nis_result *result; +static nis_name tablename_val; +static u_long tablename_len; #define NISENTRYVAL(idx,col,res) \ ((res)->objects.objects_val[(idx)].EN_data.en_cols.en_cols_val[(col)].ec_value.ec_value_val) diff --git a/nis/nss_nisplus/nisplus-service.c b/nis/nss_nisplus/nisplus-service.c index f3815344f6..76acbd0b21 100644 --- a/nis/nss_nisplus/nisplus-service.c +++ b/nis/nss_nisplus/nisplus-service.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 1999, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1997. @@ -29,9 +29,9 @@ __libc_lock_define_initialized (static, lock); -static nis_result *result = NULL; -static nis_name tablename_val = NULL; -static u_long tablename_len = 0; +static nis_result *result; +static nis_name tablename_val; +static u_long tablename_len; #define NISENTRYVAL(idx,col,res) \ ((res)->objects.objects_val[(idx)].EN_data.en_cols.en_cols_val[(col)].ec_value.ec_value_val) diff --git a/nis/nss_nisplus/nisplus-spwd.c b/nis/nss_nisplus/nisplus-spwd.c index f8a8a5a3c2..594c21b308 100644 --- a/nis/nss_nisplus/nisplus-spwd.c +++ b/nis/nss_nisplus/nisplus-spwd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997 Free Software Foundation, Inc. +/* Copyright (C) 1997, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1997. @@ -29,9 +29,9 @@ __libc_lock_define_initialized (static, lock) -static nis_result *result = NULL; -static nis_name tablename_val = NULL; -static u_long tablename_len = 0; +static nis_result *result; +static nis_name tablename_val; +static u_long tablename_len; static enum nss_status _nss_create_tablename (int *errnop)