diff options
| author | dim <dim@FreeBSD.org> | 2015-09-20 20:34:17 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-09-20 20:34:17 +0000 |
| commit | 18b14b4a2fd66af5fcf07d469fe45b32b2c0be76 (patch) | |
| tree | 6068d0c9297482b6c68c78d37d113e16d44371c0 /lib/libc/gen/getusershell.c | |
| parent | 7b8be099124cf3848a48077ce37206e0ae691839 (diff) | |
| parent | e5a64a53e6f41e1fb2f62f6b0fdfdbe1b7d5f5b0 (diff) | |
| download | FreeBSD-src-18b14b4a2fd66af5fcf07d469fe45b32b2c0be76.zip FreeBSD-src-18b14b4a2fd66af5fcf07d469fe45b32b2c0be76.tar.gz | |
Merge ^/head r287878 through r288034.
Diffstat (limited to 'lib/libc/gen/getusershell.c')
| -rw-r--r-- | lib/libc/gen/getusershell.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/lib/libc/gen/getusershell.c b/lib/libc/gen/getusershell.c index 53536e1..6e78286 100644 --- a/lib/libc/gen/getusershell.c +++ b/lib/libc/gen/getusershell.c @@ -102,10 +102,7 @@ static int _local_initshells(void *, void *, va_list); /*ARGSUSED*/ static int -_local_initshells(rv, cb_data, ap) - void *rv; - void *cb_data; - va_list ap; +_local_initshells(void *rv, void *cb_data, va_list ap) { char *sp, *cp; FILE *fp; @@ -139,10 +136,7 @@ static int _dns_initshells(void *, void *, va_list); /*ARGSUSED*/ static int -_dns_initshells(rv, cb_data, ap) - void *rv; - void *cb_data; - va_list ap; +_dns_initshells(void *rv, void *cb_data, va_list ap) { char shellname[] = "shells-XXXXX"; int hsindex, hpi, r; @@ -183,10 +177,7 @@ static int _nis_initshells(void *, void *, va_list); /*ARGSUSED*/ static int -_nis_initshells(rv, cb_data, ap) - void *rv; - void *cb_data; - va_list ap; +_nis_initshells(void *rv, void *cb_data, va_list ap) { static char *ypdomain; char *key, *data; @@ -239,7 +230,7 @@ _nis_initshells(rv, cb_data, ap) #endif /* YP */ static const char *const * -initshells() +initshells(void) { static const ns_dtab dtab[] = { NS_FILES_CB(_local_initshells, NULL) |
