diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:06:20 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:06:58 +0000 |
commit | 3fcbb67b7949a8b362de5558bf1c6dd7ec5d21cf (patch) | |
tree | b867f9a6d3426f212b2f073bef8067a830f13022 /inet/getnetgrent_r.c | |
parent | b6df7ac2cbe11e6a72f2ab7bd35c6130b72d21d9 (diff) | |
parent | cab56836b146bc129f1ad43f0393d95a9deca63a (diff) |
Merge commit 'refs/top-bases/t/tls-threadvar' into t/tls-threadvar
Diffstat (limited to 'inet/getnetgrent_r.c')
-rw-r--r-- | inet/getnetgrent_r.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/inet/getnetgrent_r.c b/inet/getnetgrent_r.c index 1af97c0380..dc0aa4f627 100644 --- a/inet/getnetgrent_r.c +++ b/inet/getnetgrent_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2016 Free Software Foundation, Inc. +/* Copyright (C) 1996-2018 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 @@ -36,10 +36,6 @@ __libc_lock_define_initialized (static, lock) kept in this structure. */ static struct __netgrent dataset; -/* The lookup function for the first entry of this service. */ -extern int __nss_netgroup_lookup (service_user **nipp, const char *name, - void **fctp) internal_function; - /* Set up NIP to run through the services. Return nonzero if there are no services (left). */ static int @@ -54,7 +50,7 @@ setup (void **fctp, service_user **nipp) { /* Executing this more than once at the same time must yield the same result every time. So we need no locking. */ - no_more = __nss_netgroup_lookup (nipp, "setnetgrent", fctp); + no_more = __nss_netgroup_lookup2 (nipp, "setnetgrent", NULL, fctp); startp = no_more ? (service_user *) -1 : *nipp; #ifdef PTR_MANGLE PTR_MANGLE (startp); @@ -114,7 +110,6 @@ endnetgrent_hook (struct __netgrent *datap) } static int -internal_function __internal_setnetgrent_reuse (const char *group, struct __netgrent *datap, int *errnop) { @@ -172,7 +167,6 @@ __internal_setnetgrent_reuse (const char *group, struct __netgrent *datap, } int -internal_function __internal_setnetgrent (const char *group, struct __netgrent *datap) { /* Free list of all netgroup names from last run. */ @@ -214,7 +208,6 @@ setnetgrent (const char *group) } void -internal_function __internal_endnetgrent (struct __netgrent *datap) { endnetgrent_hook (datap); @@ -263,7 +256,6 @@ nscd_getnetgrent (struct __netgrent *datap, char *buffer, size_t buflen, #endif int -internal_function __internal_getnetgrent_r (char **hostp, char **userp, char **domainp, struct __netgrent *datap, char *buffer, size_t buflen, int *errnop) |