diff options
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/XXX-lookup.c | 4 | ||||
| -rw-r--r-- | nss/getXXbyYY_r.c | 4 | ||||
| -rw-r--r-- | nss/nsswitch.c | 5 |
3 files changed, 5 insertions, 8 deletions
diff --git a/nss/XXX-lookup.c b/nss/XXX-lookup.c index 900bc307b9..dc7a663abd 100644 --- a/nss/XXX-lookup.c +++ b/nss/XXX-lookup.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -53,7 +53,7 @@ #define DEFAULT_CONFIG NULL #endif -service_user *DATABASE_NAME_SYMBOL = NULL; +service_user *DATABASE_NAME_SYMBOL; int DB_LOOKUP_FCT (service_user **ni, const char *fct_name, void **fctp) diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c index 3c7f2a14bb..33b4fc94e8 100644 --- a/nss/getXXbyYY_r.c +++ b/nss/getXXbyYY_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -104,7 +104,7 @@ int INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer, size_t buflen, LOOKUP_TYPE **result H_ERRNO_PARM) { - static service_user *startp = NULL; + static service_user *startp; static lookup_function start_fct; service_user *nip; lookup_function fct; diff --git a/nss/nsswitch.c b/nss/nsswitch.c index 5bce1f5af3..1a6c16e3ae 100644 --- a/nss/nsswitch.c +++ b/nss/nsswitch.c @@ -505,7 +505,6 @@ nss_parse_file (const char *fname) { name_database_entry *this; ssize_t n; - char *cp; n = __getline (&line, &len, fp); if (n < 0) @@ -516,9 +515,7 @@ nss_parse_file (const char *fname) /* Because the file format does not know any form of quoting we can search forward for the next '#' character and if found make it terminating the line. */ - cp = strchr (line, '#'); - if (cp != NULL) - *cp = '\0'; + *__strchrnul (line, '#') = '\0'; /* If the line is blank it is ignored. */ if (line[0] == '\0') |