===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/netstat/main.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -c -r1.33 -r1.34
*** src/usr.bin/netstat/main.c	2002/08/04 16:52:07	1.33
--- src/usr.bin/netstat/main.c	2003/02/01 01:51:31	1.34
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.33 2002/08/04 16:52:07 deraadt Exp $	*/
  /*	$NetBSD: main.c,v 1.9 1996/05/07 02:55:02 thorpej Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.34 2003/02/01 01:51:31 deraadt Exp $	*/
  /*	$NetBSD: main.c,v 1.9 1996/05/07 02:55:02 thorpej Exp $	*/
  
  /*
***************
*** 44,50 ****
  #if 0
  static char sccsid[] = "from: @(#)main.c	8.4 (Berkeley) 3/1/94";
  #else
! static char *rcsid = "$OpenBSD: main.c,v 1.33 2002/08/04 16:52:07 deraadt Exp $";
  #endif
  #endif /* not lint */
  
--- 44,50 ----
  #if 0
  static char sccsid[] = "from: @(#)main.c	8.4 (Berkeley) 3/1/94";
  #else
! static char *rcsid = "$OpenBSD: main.c,v 1.34 2003/02/01 01:51:31 deraadt Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 274,282 ****
  };
  
  #ifndef INET6
! struct protox *protoprotox[] = { protox, ipxprotox, nsprotox, isoprotox, atalkprotox, NULL };
  #else
! struct protox *protoprotox[] = { protox, ip6protox, ipxprotox, nsprotox, isoprotox, atalkprotox, NULL };
  #endif
  
  static void printproto(struct protox *, char *);
--- 274,286 ----
  };
  
  #ifndef INET6
! struct protox *protoprotox[] = {
! 	protox, ipxprotox, nsprotox, isoprotox, atalkprotox, NULL
! };
  #else
! struct protox *protoprotox[] = {
! 	protox, ip6protox, ipxprotox, nsprotox, isoprotox, atalkprotox, NULL
! };
  #endif
  
  static void printproto(struct protox *, char *);
***************
*** 287,295 ****
  kvm_t *kvmd;
  
  int
! main(argc, argv)
! 	int argc;
! 	char *argv[];
  {
  	extern char *optarg;
  	extern int optind;
--- 291,297 ----
  kvm_t *kvmd;
  
  int
! main(int argc, char *argv[])
  {
  	extern char *optarg;
  	extern int optind;
***************
*** 545,553 ****
   * is not in the namelist, ignore this one.
   */
  static void
! printproto(tp, name)
! 	struct protox *tp;
! 	char *name;
  {
  	void (*pr)();
  	u_long off;
--- 547,553 ----
   * is not in the namelist, ignore this one.
   */
  static void
! printproto(struct protox *tp, char *name)
  {
  	void (*pr)();
  	u_long off;
***************
*** 567,576 ****
   * Read kernel memory, return 0 on success.
   */
  int
! kread(addr, buf, size)
! 	u_long addr;
! 	char *buf;
! 	int size;
  {
  
  	if (kvm_read(kvmd, addr, buf, size) != size) {
--- 567,573 ----
   * Read kernel memory, return 0 on success.
   */
  int
! kread(u_long addr, char *buf, int size)
  {
  
  	if (kvm_read(kvmd, addr, buf, size) != size) {
***************
*** 582,596 ****
  }
  
  char *
! plural(n)
! 	int n;
  {
  	return (n != 1 ? "s" : "");
  }
  
  char *
! plurales(n)
! 	int n;
  {
  	return (n != 1 ? "es" : "");
  }
--- 579,591 ----
  }
  
  char *
! plural(int n)
  {
  	return (n != 1 ? "s" : "");
  }
  
  char *
! plurales(int n)
  {
  	return (n != 1 ? "es" : "");
  }
***************
*** 599,606 ****
   * Find the protox for the given "well-known" name.
   */
  static struct protox *
! knownname(name)
! 	char *name;
  {
  	struct protox **tpp, *tp;
  
--- 594,600 ----
   * Find the protox for the given "well-known" name.
   */
  static struct protox *
! knownname(char *name)
  {
  	struct protox **tpp, *tp;
  
***************
*** 615,622 ****
   * Find the protox corresponding to name.
   */
  static struct protox *
! name2protox(name)
! 	char *name;
  {
  	struct protox *tp;
  	char **alias;			/* alias from p->aliases */
--- 609,615 ----
   * Find the protox corresponding to name.
   */
  static struct protox *
! name2protox(char *name)
  {
  	struct protox *tp;
  	char **alias;			/* alias from p->aliases */
***************
*** 643,649 ****
  }
  
  static void
! usage()
  {
  	(void)fprintf(stderr,
  "usage: %s [-Aan] [-f address_family] [-M core] [-N system]\n", __progname);
--- 636,642 ----
  }
  
  static void
! usage(void)
  {
  	(void)fprintf(stderr,
  "usage: %s [-Aan] [-f address_family] [-M core] [-N system]\n", __progname);