shell_cmds-216.60.1.tar.gz

[apple/shell_cmds.git] / w / pr_time.c

diff --git a/w/pr_time.c b/w/pr_time.c
index 5027d9f303b53ef667acba44919344d9f43beafd..77d506d0ae88ed4a658461e8851eafc50b02a1af 100644 (file)
--- a/w/pr_time.c
+++ b/w/pr_time.c
@@ -10,11 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.

- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors

  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *


@@ -33,6 +29,10 @@
 
 #include <sys/cdefs.h>
 
 
 #include <sys/cdefs.h>
 

+#ifndef __APPLE__
+__FBSDID("$FreeBSD: src/usr.bin/w/pr_time.c,v 1.19 2002/06/07 01:41:54 jmallett Exp $");
+#endif
+

 #ifndef lint
 static const char sccsid[] = "@(#)pr_time.c    8.2 (Berkeley) 4/4/94";
 #endif
 #ifndef lint
 static const char sccsid[] = "@(#)pr_time.c    8.2 (Berkeley) 4/4/94";
 #endif


@@ -50,8 +50,7 @@ static const char sccsid[] = "@(#)pr_time.c   8.2 (Berkeley) 4/4/94";
  *     Print the time since the user logged in.
  */
 void
  *     Print the time since the user logged in.
  */
 void

-pr_attime(started, now)
-       time_t *started, *now;
+pr_attime(time_t *started, time_t *now)

 {
        static char buf[256];
        struct tm tp, tm;
 {
        static char buf[256];
        struct tm tp, tm;


@@ -90,8 +89,7 @@ pr_attime(started, now)
  *     Returns number of excess characters that were used for long idle time.
  */
 int
  *     Returns number of excess characters that were used for long idle time.
  */
 int

-pr_idle(idle)
-       time_t idle;
+pr_idle(time_t idle)

 {
        /* If idle more than 36 hours, print as a number of days. */
        if (idle >= 36 * 3600) {
 {
        /* If idle more than 36 hours, print as a number of days. */
        if (idle >= 36 * 3600) {