===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/netstat/if.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -c -r1.32 -r1.33
*** src/usr.bin/netstat/if.c	2002/06/19 23:40:20	1.32
--- src/usr.bin/netstat/if.c	2003/02/01 01:51:31	1.33
***************
*** 1,4 ****
! /*	$OpenBSD: if.c,v 1.32 2002/06/19 23:40:20 itojun Exp $	*/
  /*	$NetBSD: if.c,v 1.16.4.2 1996/06/07 21:46:46 thorpej Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: if.c,v 1.33 2003/02/01 01:51:31 deraadt Exp $	*/
  /*	$NetBSD: if.c,v 1.16.4.2 1996/06/07 21:46:46 thorpej Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "from: @(#)if.c	8.2 (Berkeley) 2/21/94";
  #else
! static char *rcsid = "$OpenBSD: if.c,v 1.32 2002/06/19 23:40:20 itojun Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "from: @(#)if.c	8.2 (Berkeley) 2/21/94";
  #else
! static char *rcsid = "$OpenBSD: if.c,v 1.33 2003/02/01 01:51:31 deraadt Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 80,88 ****
   * which is a TAILQ_HEAD.
   */
  void
! intpr(interval, ifnetaddr)
! 	int interval;
! 	u_long ifnetaddr;
  {
  	struct ifnet ifnet;
  	union {
--- 80,86 ----
   * which is a TAILQ_HEAD.
   */
  void
! intpr(int interval, u_long ifnetaddr)
  {
  	struct ifnet ifnet;
  	union {
***************
*** 95,102 ****
  		struct ipx_ifaddr ipx;
  		struct iso_ifaddr iso;
  	} ifaddr;
! 	u_long total;
! 	u_long ifaddraddr;
  	struct sockaddr *sa;
  	struct ifnet_head ifhead;	/* TAILQ_HEAD */
  	char name[IFNAMSIZ];
--- 93,99 ----
  		struct ipx_ifaddr ipx;
  		struct iso_ifaddr iso;
  	} ifaddr;
! 	u_long total, ifaddraddr;
  	struct sockaddr *sa;
  	struct ifnet_head ifhead;	/* TAILQ_HEAD */
  	char name[IFNAMSIZ];
***************
*** 120,126 ****
  	ifnetaddr = (u_long)ifhead.tqh_first;
  
  	printf("%-7.7s %-5.5s %-11.11s %-17.17s ",
! 	       "Name", "Mtu", "Network", "Address");
  	if (bflag)
  		printf("%10.10s %10.10s", "Ibytes", "Obytes");
  	else
--- 117,123 ----
  	ifnetaddr = (u_long)ifhead.tqh_first;
  
  	printf("%-7.7s %-5.5s %-11.11s %-17.17s ",
! 	    "Name", "Mtu", "Network", "Address");
  	if (bflag)
  		printf("%10.10s %10.10s", "Ibytes", "Obytes");
  	else
***************
*** 394,402 ****
   * First line printed at top of screen is always cumulative.
   */
  static void
! sidewaysintpr(interval, off)
! 	unsigned interval;
! 	u_long off;
  {
  	struct ifnet ifnet;
  	u_long firstifnet;
--- 391,397 ----
   * First line printed at top of screen is always cumulative.
   */
  static void
! sidewaysintpr(unsigned int interval, u_long off)
  {
  	struct ifnet ifnet;
  	u_long firstifnet;
***************
*** 577,584 ****
   * Sets a flag to not wait for the alarm.
   */
  static void
! catchalarm(signo)
! 	int signo;
  {
  	signalled = YES;
  }
--- 572,578 ----
   * Sets a flag to not wait for the alarm.
   */
  static void
! catchalarm(int signo)
  {
  	signalled = YES;
  }