OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

NSS: Remove internal_function function attribute

This commit is contained in:
Florian Weimer 2017-08-31 15:56:32 +02:00
parent 0c71122c0c
commit 75b3047eac
9 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2017-08-31 Florian Weimer <fweimer@redhat.com>
* 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.
2017-08-31 Florian Weimer <fweimer@redhat.com>
* malloc/arena.c (__malloc_fork_lock_parent)

8
include/nss.h
View File

@ -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 */

4
nscd/nscd_getgr_r.c
View File

@ -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)

3
nscd/nscd_gethst_r.c
View File

@ -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)

4
nscd/nscd_getpw_r.c
View File

@ -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)

13
nss/nsswitch.c
View File

@ -42,13 +42,12 @@
#include <sysdep.h>
/* 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
@ -532,7 +531,6 @@ libc_hidden_def (__nss_lookup_function)
static name_database *
internal_function
nss_parse_file (const char *fname)
{
FILE *fp;
@ -608,7 +606,6 @@ nss_parse_file (const char *fname)
`( <source> ( "[" "!"? (<status> "=" <action> )+ "]" )? )*'
*/
static service_user *
internal_function
nss_parse_service_list (const char *line)
{
service_user *result = NULL, **nextp = &result;
@ -757,7 +754,6 @@ nss_parse_service_list (const char *line)
}
static name_database_entry *
internal_function
nss_getline (char *line)
{
const char *name;
@ -799,7 +795,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;

1
nss/rewrite_field.c
View File

@ -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;

1
nss/valid_field.c
View File

@ -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

1
nss/valid_list_field.c
View File

@ -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)