===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/netstat/Attic/ns.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/netstat/Attic/ns.c	2002/06/09 04:07:10	1.9
--- src/usr.bin/netstat/Attic/ns.c	2003/02/01 01:51:31	1.10
***************
*** 1,4 ****
! /*	$OpenBSD: ns.c,v 1.9 2002/06/09 04:07:10 jsyn Exp $	*/
  /*	$NetBSD: ns.c,v 1.8 1995/10/03 21:42:46 thorpej Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: ns.c,v 1.10 2003/02/01 01:51:31 deraadt Exp $	*/
  /*	$NetBSD: ns.c,v 1.8 1995/10/03 21:42:46 thorpej Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "from: @(#)ns.c	8.1 (Berkeley) 6/6/93";
  #else
! static char *rcsid = "$OpenBSD: ns.c,v 1.9 2002/06/09 04:07:10 jsyn Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "from: @(#)ns.c	8.1 (Berkeley) 6/6/93";
  #else
! static char *rcsid = "$OpenBSD: ns.c,v 1.10 2003/02/01 01:51:31 deraadt Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 89,97 ****
   */
  
  void
! nsprotopr(off, name)
! 	u_long off;
! 	char *name;
  {
  	struct nspcb cb;
  	struct nspcb *prev, *next;
--- 89,95 ----
   */
  
  void
! nsprotopr(u_long off, char *name)
  {
  	struct nspcb cb;
  	struct nspcb *prev, *next;
***************
*** 134,149 ****
  			if (Aflag)
  				printf("%-8.8s ", "PCB");
  			printf(Aflag ?
! 				"%-5.5s %-6.6s %-6.6s  %-18.18s %-18.18s %s\n" :
! 				"%-5.5s %-6.6s %-6.6s  %-22.22s %-22.22s %s\n",
! 				"Proto", "Recv-Q", "Send-Q",
! 				"Local Address", "Foreign Address", "(state)");
  			first = 0;
  		}
  		if (Aflag)
  			printf("%8lx ", ppcb);
  		printf("%-5.5s %6ld %6ld ", name, sockb.so_rcv.sb_cc,
! 			sockb.so_snd.sb_cc);
  		printf("  %-22.22s", ns_prpr(&nspcb.nsp_laddr));
  		printf(" %-22.22s", ns_prpr(&nspcb.nsp_faddr));
  		if (isspp) {
--- 132,147 ----
  			if (Aflag)
  				printf("%-8.8s ", "PCB");
  			printf(Aflag ?
! 			    "%-5.5s %-6.6s %-6.6s  %-18.18s %-18.18s %s\n" :
! 			    "%-5.5s %-6.6s %-6.6s  %-22.22s %-22.22s %s\n",
! 			    "Proto", "Recv-Q", "Send-Q",
! 			    "Local Address", "Foreign Address", "(state)");
  			first = 0;
  		}
  		if (Aflag)
  			printf("%8lx ", ppcb);
  		printf("%-5.5s %6ld %6ld ", name, sockb.so_rcv.sb_cc,
! 		    sockb.so_snd.sb_cc);
  		printf("  %-22.22s", ns_prpr(&nspcb.nsp_laddr));
  		printf(" %-22.22s", ns_prpr(&nspcb.nsp_faddr));
  		if (isspp) {
***************
*** 164,172 ****
   * Dump SPP statistics structure.
   */
  void
! spp_stats(off, name)
! 	u_long off;
! 	char *name;
  {
  	struct spp_istat spp_istat;
  #define sppstat spp_istat.newstats
--- 162,168 ----
   * Dump SPP statistics structure.
   */
  void
! spp_stats(u_long off, char *name)
  {
  	struct spp_istat spp_istat;
  #define sppstat spp_istat.newstats
***************
*** 247,255 ****
   * Dump IDP statistics structure.
   */
  void
! idp_stats(off, name)
! 	u_long off;
! 	char *name;
  {
  	struct idpstat idpstat;
  
--- 243,249 ----
   * Dump IDP statistics structure.
   */
  void
! idp_stats(u_long off, char *name)
  {
  	struct idpstat idpstat;
  
***************
*** 283,291 ****
   */
  /*ARGSUSED*/
  void
! nserr_stats(off, name)
! 	u_long off;
! 	char *name;
  {
  	struct ns_errstat ns_errstat;
  	int j;
--- 277,283 ----
   */
  /*ARGSUSED*/
  void
! nserr_stats(u_long off, char *name)
  {
  	struct ns_errstat ns_errstat;
  	int j;
***************
*** 326,337 ****
  }
  
  static void
! ns_erputil(z, c)
! 	int z, c;
  {
- 	int j;
- 	char codebuf[30];
  	char *name, *where;
  
  	for (j = 0;; j ++) {
  		if ((name = ns_errnames[j].name) == 0)
--- 318,328 ----
  }
  
  static void
! ns_erputil(int z, int c)
  {
  	char *name, *where;
+ 	char codebuf[30];
+ 	int j;
  
  	for (j = 0;; j ++) {
  		if ((name = ns_errnames[j].name) == 0)
***************
*** 355,362 ****
  static struct sockaddr_ns ssns = {AF_NS};
  
  static
! char *ns_prpr(x)
! 	struct ns_addr *x;
  {
  	struct sockaddr_ns *sns = &ssns;
  
--- 346,352 ----
  static struct sockaddr_ns ssns = {AF_NS};
  
  static
! char *ns_prpr(struct ns_addr *x)
  {
  	struct sockaddr_ns *sns = &ssns;