getpwuid() is already declared in <pwd.h>

SCCS-vsn: sbin/reboot/halt.c 5.8
SCCS-vsn: sbin/reboot/reboot.c 5.10
SCCS-vsn: sbin/shutdown/shutdown.c 5.16

diff --git a/usr/src/sbin/reboot/halt.c b/usr/src/sbin/reboot/halt.c
index 6a15468..d8fdfe2 100644 (file)
--- a/usr/src/sbin/reboot/halt.c
+++ b/usr/src/sbin/reboot/halt.c
@@ -12,7 +12,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)halt.c     5.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)halt.c     5.8 (Berkeley) %G%";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -34,7 +34,7 @@ main(argc, argv)
 {
        register int i;
        register int qflag = 0;
 {
        register int i;
        register int qflag = 0;

-       struct passwd *pw, *getpwuid();
+       struct passwd *pw;

        int ch, howto, needlog = 1;
        char *user, *ttyn, *getlogin(), *ttyname();
 
        int ch, howto, needlog = 1;
        char *user, *ttyn, *getlogin(), *ttyname();
 


@@ -120,6 +120,7 @@ dingdong()
 }
 
 setalarm(n)
 }
 
 setalarm(n)

+       int n;

 {
        signal(SIGALRM, dingdong);
        alarm(n);
 {
        signal(SIGALRM, dingdong);
        alarm(n);

diff --git a/usr/src/sbin/reboot/reboot.c b/usr/src/sbin/reboot/reboot.c
index 8172900..60f651f 100644 (file)
--- a/usr/src/sbin/reboot/reboot.c
+++ b/usr/src/sbin/reboot/reboot.c
@@ -12,7 +12,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)reboot.c   5.9 (Berkeley) %G%";
+static char sccsid[] = "@(#)reboot.c   5.10 (Berkeley) %G%";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -39,7 +39,7 @@ main(argc, argv)
        register qflag = 0;
        int needlog = 1;
        char *user, *getlogin();
        register qflag = 0;
        int needlog = 1;
        char *user, *getlogin();

-       struct passwd *pw, *getpwuid();
+       struct passwd *pw;

 
        openlog("reboot", 0, LOG_AUTH);
        argc--, argv++;
 
        openlog("reboot", 0, LOG_AUTH);
        argc--, argv++;


@@ -115,6 +115,7 @@ dingdong()
 }
 
 setalarm(n)
 }
 
 setalarm(n)

+       int n;

 {
        signal(SIGALRM, dingdong);
        alarm(n);
 {
        signal(SIGALRM, dingdong);
        alarm(n);

diff --git a/usr/src/sbin/shutdown/shutdown.c b/usr/src/sbin/shutdown/shutdown.c
index 86d0693..037e6dd 100644 (file)
--- a/usr/src/sbin/shutdown/shutdown.c
+++ b/usr/src/sbin/shutdown/shutdown.c
@@ -12,7 +12,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)shutdown.c 5.15 (Berkeley) %G%";
+static char sccsid[] = "@(#)shutdown.c 5.16 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -62,7 +62,7 @@ main(argc, argv)
        extern int optind;
        register char *p, *endp;
        int arglen, ch, len, readstdin;
        extern int optind;
        register char *p, *endp;
        int arglen, ch, len, readstdin;

-       struct passwd *pw, *getpwuid();
+       struct passwd *pw;

        char *strcat(), *getlogin();
        uid_t geteuid();
 
        char *strcat(), *getlogin();
        uid_t geteuid();