From patchwork Wed Aug 16 16:28:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 22154 Received: (qmail 122277 invoked by alias); 16 Aug 2017 16:28:28 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 122038 invoked by uid 89); 16 Aug 2017 16:28:24 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=4212 X-HELO: mx1.redhat.com DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com F3D9019C330 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=fweimer@redhat.com Date: Wed, 16 Aug 2017 18:28:18 +0200 To: libc-alpha@sourceware.org Subject: [PATCH] NSS: Remove internal_function function attribute User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: <20170816162818.E3D5441DB799C@oldenburg.str.redhat.com> From: fweimer@redhat.com (Florian Weimer) 2017-08-16 Florian Weimer * include/nss.h (__nss_valid_field, __nss_valid_list_field) (__nss_rewrite_field): Remove internal_function. * nscd/nscd_getgr_r.c (nscd_getgr_r): Likewise. * nscd/nscd_gethst_r.c (nscd_gethst_r): Likewise. * nscd/nscd_getpw_r.c (nscd_getpw_r): Likewise. * nss/nsswitch.c (nss_parse_file, nss_getline) (nss_parse_service_list, nss_new_service): Likewise. * nss/rewrite_field.c (__nss_rewrite_field): Likewise. * nss/valid_field.c (__nss_valid_field): Likewise. * nss/valid_list_field.c (__nss_valid_list_field): Likewise. diff --git a/include/nss.h b/include/nss.h index 6358a10fd3..5f29de7f84 100644 --- a/include/nss.h +++ b/include/nss.h @@ -6,12 +6,10 @@ #define NSS_INVALID_FIELD_CHARACTERS ":\n" extern const char __nss_invalid_field_characters[] attribute_hidden; -_Bool __nss_valid_field (const char *value) - attribute_hidden internal_function; -_Bool __nss_valid_list_field (char **list) - attribute_hidden internal_function; +_Bool __nss_valid_field (const char *value) attribute_hidden; +_Bool __nss_valid_list_field (char **list) attribute_hidden; const char *__nss_rewrite_field (const char *value, char **to_be_freed) - attribute_hidden internal_function; + attribute_hidden; # endif /* !_ISOMAC */ #endif /* _NSS_H */ diff --git a/nscd/nscd_getgr_r.c b/nscd/nscd_getgr_r.c index 87b4552197..f0a7123b75 100644 --- a/nscd/nscd_getgr_r.c +++ b/nscd/nscd_getgr_r.c @@ -40,8 +40,7 @@ int __nss_not_use_nscd_group; static int nscd_getgr_r (const char *key, size_t keylen, request_type type, struct group *resultbuf, char *buffer, - size_t buflen, struct group **result) - internal_function; + size_t buflen, struct group **result); int @@ -82,7 +81,6 @@ libc_freeres_fn (gr_map_free) static int -internal_function nscd_getgr_r (const char *key, size_t keylen, request_type type, struct group *resultbuf, char *buffer, size_t buflen, struct group **result) diff --git a/nscd/nscd_gethst_r.c b/nscd/nscd_gethst_r.c index daa708b3d3..3bedd240e6 100644 --- a/nscd/nscd_gethst_r.c +++ b/nscd/nscd_gethst_r.c @@ -32,7 +32,7 @@ int __nss_not_use_nscd_hosts; static int nscd_gethst_r (const char *key, size_t keylen, request_type type, struct hostent *resultbuf, char *buffer, size_t buflen, struct hostent **result, - int *h_errnop) internal_function; + int *h_errnop); int @@ -135,7 +135,6 @@ __nscd_get_nl_timestamp (void) int __nss_have_localdomain attribute_hidden; static int -internal_function nscd_gethst_r (const char *key, size_t keylen, request_type type, struct hostent *resultbuf, char *buffer, size_t buflen, struct hostent **result, int *h_errnop) diff --git a/nscd/nscd_getpw_r.c b/nscd/nscd_getpw_r.c index b291d2fa44..f3b58d83a1 100644 --- a/nscd/nscd_getpw_r.c +++ b/nscd/nscd_getpw_r.c @@ -38,8 +38,7 @@ int __nss_not_use_nscd_passwd; static int nscd_getpw_r (const char *key, size_t keylen, request_type type, struct passwd *resultbuf, char *buffer, - size_t buflen, struct passwd **result) - internal_function; + size_t buflen, struct passwd **result); int __nscd_getpwnam_r (const char *name, struct passwd *resultbuf, char *buffer, @@ -81,7 +80,6 @@ libc_freeres_fn (pw_map_free) static int -internal_function nscd_getpw_r (const char *key, size_t keylen, request_type type, struct passwd *resultbuf, char *buffer, size_t buflen, struct passwd **result) diff --git a/nss/nsswitch.c b/nss/nsswitch.c index 8f31658523..b77f19a150 100644 --- a/nss/nsswitch.c +++ b/nss/nsswitch.c @@ -42,13 +42,12 @@ #include /* Prototypes for the local functions. */ -static name_database *nss_parse_file (const char *fname) internal_function; -static name_database_entry *nss_getline (char *line) internal_function; -static service_user *nss_parse_service_list (const char *line) - internal_function; +static name_database *nss_parse_file (const char *fname); +static name_database_entry *nss_getline (char *line); +static service_user *nss_parse_service_list (const char *line); #if !defined DO_STATIC_NSS || defined SHARED static service_library *nss_new_service (name_database *database, - const char *name) internal_function; + const char *name); #endif @@ -528,7 +527,6 @@ libc_hidden_def (__nss_lookup_function) static name_database * -internal_function nss_parse_file (const char *fname) { FILE *fp; @@ -604,7 +602,6 @@ nss_parse_file (const char *fname) `( ( "[" "!"? ( "=" )+ "]" )? )*' */ static service_user * -internal_function nss_parse_service_list (const char *line) { service_user *result = NULL, **nextp = &result; @@ -753,7 +750,6 @@ nss_parse_service_list (const char *line) } static name_database_entry * -internal_function nss_getline (char *line) { const char *name; @@ -795,7 +791,6 @@ nss_getline (char *line) #if !defined DO_STATIC_NSS || defined SHARED static service_library * -internal_function nss_new_service (name_database *database, const char *name) { service_library **currentp = &database->library; diff --git a/nss/rewrite_field.c b/nss/rewrite_field.c index c0ae3d23f2..3c456fe22d 100644 --- a/nss/rewrite_field.c +++ b/nss/rewrite_field.c @@ -24,7 +24,6 @@ overwritten with a pointer the caller has to free if the function returns successfully. On failure, return NULL. */ const char * -internal_function __nss_rewrite_field (const char *value, char **to_be_freed) { *to_be_freed = NULL; diff --git a/nss/valid_field.c b/nss/valid_field.c index 88c41a81a0..5146b9cce9 100644 --- a/nss/valid_field.c +++ b/nss/valid_field.c @@ -24,7 +24,6 @@ const char __nss_invalid_field_characters[] = NSS_INVALID_FIELD_CHARACTERS; does not contain characters not permitted in NSS database fields. */ _Bool -internal_function __nss_valid_field (const char *value) { return value == NULL diff --git a/nss/valid_list_field.c b/nss/valid_list_field.c index 9763c89bcd..1d82519299 100644 --- a/nss/valid_list_field.c +++ b/nss/valid_list_field.c @@ -24,7 +24,6 @@ static const char invalid_characters[] = NSS_INVALID_FIELD_CHARACTERS ","; /* Check that all list members match the field syntax requirements and do not contain the character ','. */ _Bool -internal_function __nss_valid_list_field (char **list) { if (list == NULL)