From: Florian Weimer <fweimer@redhat.com>
To: libc-alpha@sourceware.org
Subject: [PATCH 9/7] nss_nis: Use NSS_DECLARE_MODULE_FUNCTIONS
Date: Thu, 13 Feb 2020 10:01:30 +0100 [thread overview]
Message-ID: <875zgadfo5.fsf@oldenburg2.str.redhat.com> (raw)
In-Reply-To: <cover.1581517927.git.fweimer@redhat.com> (Florian Weimer's message of "Wed, 12 Feb 2020 15:34:14 +0100")
This commit removes the minor optimization based on strong aliases
because it loses type safety.
-----
nis/nss-nis.h | 1 +
nis/nss_nis/nis-hosts.c | 13 ++++++++-----
nis/nss_nis/nis-network.c | 15 ++++++++++-----
nis/nss_nis/nis-spwd.c | 13 +++++++++----
4 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/nis/nss-nis.h b/nis/nss-nis.h
index dc091d1a20..7c009d7e87 100644
--- a/nis/nss-nis.h
+++ b/nis/nss-nis.h
@@ -22,6 +22,7 @@
#include "nsswitch.h"
+NSS_DECLARE_MODULE_FUNCTIONS (nis)
/* Convert YP error number to NSS error number. */
extern const enum nss_status __yperr2nss_tab[] attribute_hidden;
diff --git a/nis/nss_nis/nis-hosts.c b/nis/nss_nis/nis-hosts.c
index 2d08076382..1ee5444cfc 100644
--- a/nis/nss_nis/nis-hosts.c
+++ b/nis/nss_nis/nis-hosts.c
@@ -90,9 +90,16 @@ static bool_t new_start = 1;
static char *oldkey = NULL;
static int oldkeylen = 0;
+hidden_proto (_nss_nis_endhostent)
enum nss_status
_nss_nis_sethostent (int stayopen)
+{
+ return _nss_nis_endhostent ();
+}
+
+enum nss_status
+_nss_nis_endhostent (void)
{
__libc_lock_lock (lock);
@@ -108,11 +115,7 @@ _nss_nis_sethostent (int stayopen)
return NSS_STATUS_SUCCESS;
}
-/* Make _nss_nis_endhostent an alias of _nss_nis_sethostent. We do this
- even though the prototypes don't match. The argument of sethostent
- is used so this makes no difference. */
-strong_alias (_nss_nis_sethostent, _nss_nis_endhostent)
-
+hidden_def (_nss_nis_endhostent)
/* The calling function always need to get a lock first. */
static enum nss_status
diff --git a/nis/nss_nis/nis-network.c b/nis/nss_nis/nis-network.c
index dcafd26148..511de00bd3 100644
--- a/nis/nss_nis/nis-network.c
+++ b/nis/nss_nis/nis-network.c
@@ -45,10 +45,18 @@ static bool_t new_start = 1;
static char *oldkey;
static int oldkeylen;
+hidden_proto (_nss_nis_endnetent)
+
enum nss_status
_nss_nis_setnetent (int stayopen)
{
- __libc_lock_lock (lock);
+ return _nss_nis_endnetent ();
+}
+
+enum nss_status
+_nss_nis_endnetent (void)
+{
+__libc_lock_lock (lock);
new_start = 1;
if (oldkey != NULL)
@@ -62,10 +70,7 @@ _nss_nis_setnetent (int stayopen)
return NSS_STATUS_SUCCESS;
}
-/* Make _nss_nis_endnetent an alias of _nss_nis_setnetent. We do this
- even though the prototypes don't match. The argument of setnetent
- is not used so this makes no difference. */
-strong_alias (_nss_nis_setnetent, _nss_nis_endnetent)
+hidden_def (_nss_nis_endnetent)
static enum nss_status
internal_nis_getnetent_r (struct netent *net, char *buffer, size_t buflen,
diff --git a/nis/nss_nis/nis-spwd.c b/nis/nss_nis/nis-spwd.c
index 6cd46b4022..660447b544 100644
--- a/nis/nss_nis/nis-spwd.c
+++ b/nis/nss_nis/nis-spwd.c
@@ -46,8 +46,16 @@ static bool ent_adjunct_used;
static char *oldkey;
static int oldkeylen;
+hidden_proto (_nss_nis_endspent)
+
enum nss_status
_nss_nis_setspent (int stayopen)
+{
+ return _nss_nis_endspent ();
+}
+
+enum nss_status
+_nss_nis_endspent (void)
{
__libc_lock_lock (lock);
@@ -61,10 +69,7 @@ _nss_nis_setspent (int stayopen)
return NSS_STATUS_SUCCESS;
}
-/* Make _nss_nis_endspent an alias of _nss_nis_setspent. We do this
- even though the prototypes don't match. The argument of setspent
- is not used so this makes no difference. */
-strong_alias (_nss_nis_setspent, _nss_nis_endspent)
+hidden_def (_nss_nis_endspent)
static enum nss_status
internal_nis_getspent_r (struct spwd *sp, char *buffer, size_t buflen,
next prev parent reply other threads:[~2020-02-13 9:01 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-12 14:34 [PATCH 0/7] More type safety for NSS modules Florian Weimer
2020-02-12 14:34 ` [PATCH 1/7] nss_compat: Do not use nss_* names for function pointers Florian Weimer
2020-02-12 22:36 ` DJ Delorie
2020-02-12 14:34 ` [PATCH 2/7] nss: Add function types and NSS_DECLARE_MODULE_FUNCTIONS macro to <nss.h> Florian Weimer
2020-02-13 1:10 ` DJ Delorie
2020-02-12 14:34 ` [PATCH 3/7] nss_hesiod: Use NSS_DECLARE_MODULE_FUNCTIONS Florian Weimer
2020-02-13 1:11 ` DJ Delorie
2020-02-12 14:34 ` [PATCH 4/7] nss_compat: " Florian Weimer
2020-02-13 1:14 ` DJ Delorie
2020-02-12 14:34 ` [PATCH 5/7] nss_db: " Florian Weimer
2020-02-13 1:18 ` DJ Delorie
2020-02-12 14:34 ` [PATCH 6/7] nss_files: " Florian Weimer
2020-02-13 1:26 ` DJ Delorie
2020-02-13 8:12 ` Florian Weimer
2020-02-12 14:34 ` [PATCH 7/7] nss_dns: " Florian Weimer
2020-02-13 1:19 ` DJ Delorie
2020-02-12 14:39 ` [PATCH 8/7] nss_nisplus: " Florian Weimer
2020-02-13 1:31 ` DJ Delorie
2020-02-13 8:11 ` Florian Weimer
2020-02-13 9:01 ` Florian Weimer [this message]
2020-02-13 9:16 ` [PATCH 9/7] nss_nis: " Andreas Schwab
2020-02-13 9:21 ` Andreas Schwab
2020-02-13 9:31 ` Florian Weimer
2020-02-13 9:38 ` Andreas Schwab
2020-02-25 14:50 ` Florian Weimer
2020-02-25 15:09 ` Andreas Schwab
2020-02-25 16:10 ` Florian Weimer
2020-02-25 16:41 ` Andreas Schwab
2020-02-25 16:44 ` Florian Weimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=875zgadfo5.fsf@oldenburg2.str.redhat.com \
--to=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).