diff options
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/getent.c | 12 | ||||
| -rw-r--r-- | nss/makedb.c | 5 |
2 files changed, 7 insertions, 10 deletions
diff --git a/nss/getent.c b/nss/getent.c index 64e642f1da..aa4eaf9e0d 100644 --- a/nss/getent.c +++ b/nss/getent.c @@ -55,7 +55,7 @@ static const char args_doc[] = N_("database [key ...]"); /* Supported options. */ static const struct argp_option args_options[] = { - { "service", 's', "CONFIG", 0, N_("Service configuration to be used") }, + { "service", 's', N_("CONFIG"), 0, N_("Service configuration to be used") }, { "no-idn", 'i', NULL, 0, N_("disable IDN encoding") }, { NULL, 0, NULL, 0, NULL }, }; @@ -92,7 +92,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ } /* This is for aliases */ -static inline void +static void print_aliases (struct aliasent *alias) { unsigned int i = 0; @@ -181,7 +181,7 @@ ethers_keys (int number, char *key[]) } /* This is for group */ -static inline void +static void print_group (struct group *grp) { unsigned int i = 0; @@ -600,7 +600,7 @@ networks_keys (int number, char *key[]) } /* Now is all for passwd */ -static inline void +static void print_passwd (struct passwd *pwd) { printf ("%s:%s:%lu:%lu:%s:%s:%s\n", @@ -651,7 +651,7 @@ passwd_keys (int number, char *key[]) } /* This is for protocols */ -static inline void +static void print_protocols (struct protoent *proto) { unsigned int i; @@ -701,7 +701,7 @@ protocols_keys (int number, char *key[]) } /* Now is all for rpc */ -static inline void +static void print_rpc (struct rpcent *rpc) { int i; diff --git a/nss/makedb.c b/nss/makedb.c index d4a19b3597..13bd8461d4 100644 --- a/nss/makedb.c +++ b/nss/makedb.c @@ -173,10 +173,7 @@ static void reset_file_creation_context (void); /* External functions. */ -extern void *xmalloc (size_t n) - __attribute_malloc__ __attribute_alloc_size (1); -extern void *xcalloc (size_t n, size_t s) - __attribute_malloc__ __attribute_alloc_size (1, 2); +#include <programs/xmalloc.h> int |