From b22974092d09a61fdb371b28837175bb616e78cf Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Sun, 13 Aug 2017 21:10:56 +0200 Subject: NSS: Do not use internal_function for functions with hidden aliases Such functions are called across DSO boundaries and should not use a non-standard ABI. --- grp/grp-merge.c | 2 -- grp/grp-merge.h | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'grp') diff --git a/grp/grp-merge.c b/grp/grp-merge.c index 035e7a6..df72608 100644 --- a/grp/grp-merge.c +++ b/grp/grp-merge.c @@ -36,7 +36,6 @@ }) int -internal_function __copy_grp (const struct group srcgrp, const size_t buflen, struct group *destgrp, char *destbuf, char **endptr) { @@ -117,7 +116,6 @@ libc_hidden_def (__copy_grp) /* Check that the name, GID and passwd fields match, then copy in the gr_mem array. */ int -internal_function __merge_grp (struct group *savedgrp, char *savedbuf, char *savedend, size_t buflen, struct group *mergegrp, char *mergebuf) { diff --git a/grp/grp-merge.h b/grp/grp-merge.h index 1ad9b9a..f6ee838 100644 --- a/grp/grp-merge.h +++ b/grp/grp-merge.h @@ -25,13 +25,11 @@ calling function must free(newbuf). */ int __copy_grp (const struct group srcgrp, const size_t buflen, - struct group *destgrp, char *destbuf, char **endptr) - internal_function; + struct group *destgrp, char *destbuf, char **endptr); /* Merge the member lists of two grp structs together. */ int __merge_grp (struct group *savedgrp, char *savedbuf, char *savedend, - size_t buflen, struct group *mergegrp, char *mergebuf) - internal_function; + size_t buflen, struct group *mergegrp, char *mergebuf); #endif /* _GRP_MERGE_H */ -- cgit v1.1