===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tcpbench/tcpbench.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** src/usr.bin/tcpbench/tcpbench.c	2009/09/11 20:53:36	1.15
--- src/usr.bin/tcpbench/tcpbench.c	2009/12/11 17:20:50	1.16
***************
*** 193,201 ****
  }
  
  static void
! kget(kvm_t *kh, u_long addr, void *buf, int size)
  {
! 	if (kvm_read(kh, addr, buf, size) != size)
  		errx(1, "kvm_read: %s", kvm_geterr(kh));
  }
  
--- 193,201 ----
  }
  
  static void
! kget(kvm_t *kh, u_long addr, void *buf, size_t size)
  {
! 	if (kvm_read(kh, addr, buf, size) != (ssize_t)size)
  		errx(1, "kvm_read: %s", kvm_geterr(kh));
  }
  
***************
*** 333,339 ****
  static void
  check_kvar(const char *var)
  {
! 	size_t i;
  
  	for (i = 0; allowed_kvars[i] != NULL; i++)
  		if (strcmp(allowed_kvars[i], var) == 0)
--- 333,339 ----
  static void
  check_kvar(const char *var)
  {
! 	u_int i;
  
  	for (i = 0; allowed_kvars[i] != NULL; i++)
  		if (strcmp(allowed_kvars[i], var) == 0)
***************
*** 344,350 ****
  static void
  list_kvars(void)
  {
! 	size_t i;
  
  	fprintf(stderr, "Supported kernel variables:\n");
  	for (i = 0; allowed_kvars[i] != NULL; i++)
--- 344,350 ----
  static void
  list_kvars(void)
  {
! 	u_int i;
  
  	fprintf(stderr, "Supported kernel variables:\n");
  	for (i = 0; allowed_kvars[i] != NULL; i++)
***************
*** 355,361 ****
  check_prepare_kvars(char *list)
  {
  	char *item, **ret = NULL;
! 	size_t n = 0;
  
  	while ((item = strsep(&list, ", \t\n")) != NULL) {
  		check_kvar(item);
--- 355,361 ----
  check_prepare_kvars(char *list)
  {
  	char *item, **ret = NULL;
! 	u_int n = 0;
  
  	while ((item = strsep(&list, ", \t\n")) != NULL) {
  		check_kvar(item);