35c35
< static char sccsid[] = "@(#)getpwent.c 8.1 (Berkeley) 6/4/93";
---
> static char sccsid[] = "@(#)getpwent.c 8.2 (Berkeley) 4/27/95";
55a56,60
> /*
> * The lookup techniques and data extraction code here must be kept
> * in sync with that in `pwd_mkdb'.
> */
>
165,167d169
< #ifdef __STDC__
< getpwuid(uid_t uid)
< #else
169,170c171
< int uid;
< #endif
---
> uid_t uid;
297a299
> /* THIS CODE MUST MATCH THAT IN pwd_mkdb. */
299a302
> #define SCALAR(v) memmove(&(v), p, sizeof v); p += sizeof v
302,307c305,307
< bcopy(p, (char *)&_pw_passwd.pw_uid, sizeof(int));
< p += sizeof(int);
< bcopy(p, (char *)&_pw_passwd.pw_gid, sizeof(int));
< p += sizeof(int);
< bcopy(p, (char *)&_pw_passwd.pw_change, sizeof(time_t));
< p += sizeof(time_t);
---
> SCALAR(_pw_passwd.pw_uid);
> SCALAR(_pw_passwd.pw_gid);
> SCALAR(_pw_passwd.pw_change);
312,313c312
< bcopy(p, (char *)&_pw_passwd.pw_expire, sizeof(time_t));
< p += sizeof(time_t);
---
> SCALAR(_pw_passwd.pw_expire);