diff options
| author |   Dimitry Andric <dim@FreeBSD.org> | 2016-08-16 20:19:05 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-08-16 20:19:05 +0000 |
| commit | ac719d1ccab34c24fd5b39cf8cfe49039289b033 (patch) | |
| tree | 0a1771f52aa9a90ad781b3924adc7f280aa38ae6 | |
| parent | ae4f3b0a81875867702cade7ba2f5920d92ee481 (diff) | |
| parent | 54a011838a76f1406af6edea1f1b2741105c5b80 (diff) | |
| download | pw-darwin-ac719d1ccab34c24fd5b39cf8cfe49039289b033.tar.gz pw-darwin-ac719d1ccab34c24fd5b39cf8cfe49039289b033.tar.zst pw-darwin-ac719d1ccab34c24fd5b39cf8cfe49039289b033.zip | |
Merge ^/head r303250 through r304235.
| -rw-r--r-- | pw/pw.h | 1 | ||||
| -rw-r--r-- | pw/pw_vpw.c | 6 | ||||
| -rw-r--r-- | pw/pwupd.h | 10 |
3 files changed, 3 insertions, 14 deletions
@@ -28,7 +28,6 @@ #include <sys/stat.h> -#define _WITH_GETLINE #include <inttypes.h> #include <stdio.h> #include <stdlib.h> diff --git a/pw/pw_vpw.c b/pw/pw_vpw.c index 08c8bd5..58e5294 100644 --- a/pw/pw_vpw.c +++ b/pw/pw_vpw.c @@ -33,7 +33,6 @@ static const char rcsid[] = #include <pwd.h> #include <grp.h> #include <libutil.h> -#define _WITH_GETLINE #include <stdio.h> #include <string.h> #include <stdlib.h> @@ -131,13 +130,10 @@ vendgrent(void) } } -RET_SETGRENT +void vsetgrent(void) { vendgrent(); -#if defined(__FreeBSD__) - return 0; -#endif } static struct group * @@ -38,12 +38,6 @@ #include <stdbool.h> #include <stringlist.h> -#if defined(__FreeBSD__) -#define RET_SETGRENT int -#else -#define RET_SETGRENT void -#endif - struct pwf { int _altdir; void (*_setpwent)(void); @@ -51,7 +45,7 @@ struct pwf { struct passwd * (*_getpwent)(void); struct passwd * (*_getpwuid)(uid_t uid); struct passwd * (*_getpwnam)(const char * nam); - RET_SETGRENT (*_setgrent)(void); + void (*_setgrent)(void); void (*_endgrent)(void); struct group * (*_getgrent)(void); struct group * (*_getgrgid)(gid_t gid); @@ -141,7 +135,7 @@ struct passwd * vgetpwnam(const char * nam); struct group * vgetgrent(void); struct group * vgetgrgid(gid_t gid); struct group * vgetgrnam(const char * nam); -RET_SETGRENT vsetgrent(void); +void vsetgrent(void); void vendgrent(void); void copymkdir(int rootfd, char const * dir, int skelfd, mode_t mode, uid_t uid, |