===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/buf.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/cvs/buf.c	2004/12/08 21:11:07	1.7
--- src/usr.bin/cvs/buf.c	2004/12/08 22:22:38	1.8
***************
*** 1,4 ****
! /*	$OpenBSD: buf.c,v 1.7 2004/12/08 21:11:07 djm Exp $	*/
  /*
   * Copyright (c) 2003 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: buf.c,v 1.8 2004/12/08 22:22:38 jfb Exp $	*/
  /*
   * Copyright (c) 2003 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 47,53 ****
  	u_int    cb_flags;
  
  	/* buffer handle and size */
! 	void    *cb_buf;
  	size_t   cb_size;
  
  	/* start and length of valid data in buffer */
--- 47,53 ----
  	u_int    cb_flags;
  
  	/* buffer handle and size */
! 	u_char  *cb_buf;
  	size_t   cb_size;
  
  	/* start and length of valid data in buffer */
***************
*** 57,63 ****
  
  
  
! #define SIZE_LEFT(b)  ((size_t)((u_char *)b->cb_buf - b->cb_cur) + b->cb_size)
  
  
  static ssize_t   cvs_buf_grow (BUF *, size_t);
--- 57,63 ----
  
  
  
! #define SIZE_LEFT(b)  ((size_t)(b->cb_buf - b->cb_cur) + b->cb_size)
  
  
  static ssize_t   cvs_buf_grow (BUF *, size_t);
***************
*** 92,98 ****
  
  	b->cb_flags = flags;
  	b->cb_size = len;
! 	b->cb_cur = (u_char *)b->cb_buf;
  	b->cb_len = 0;
  
  	return (b);
--- 92,98 ----
  
  	b->cb_flags = flags;
  	b->cb_size = len;
! 	b->cb_cur = b->cb_buf;
  	b->cb_len = 0;
  
  	return (b);
***************
*** 112,118 ****
  	int fd;
  	ssize_t ret;
  	size_t len;
! 	void *bp;
  	struct stat st;
  	BUF *buf;
  
--- 112,118 ----
  	int fd;
  	ssize_t ret;
  	size_t len;
! 	u_char *bp;
  	struct stat st;
  	BUF *buf;
  
***************
*** 140,146 ****
  		if (ret == -1) {
  			cvs_log(LP_ERRNO, "read failed from buffer source");
  			(void)close(fd);
! 			cvs_buf_free(bp);
  			return (NULL);
  		} else if (ret == 0)
  			break;
--- 140,146 ----
  		if (ret == -1) {
  			cvs_log(LP_ERRNO, "read failed from buffer source");
  			(void)close(fd);
! 			cvs_buf_free(buf);
  			return (NULL);
  		} else if (ret == 0)
  			break;
***************
*** 177,183 ****
  void*
  cvs_buf_release(BUF *b)
  {
! 	void *tmp;
  
  	tmp = b->cb_buf;
  	free(b);
--- 177,183 ----
  void*
  cvs_buf_release(BUF *b)
  {
! 	u_char *tmp;
  
  	tmp = b->cb_buf;
  	free(b);
***************
*** 193,199 ****
  void
  cvs_buf_empty(BUF *b)
  {
! 	b->cb_cur = (u_char *)b->cb_buf;
  	b->cb_len = 0;
  }
  
--- 193,199 ----
  void
  cvs_buf_empty(BUF *b)
  {
! 	b->cb_cur = b->cb_buf;
  	b->cb_len = 0;
  }
  
***************
*** 294,300 ****
  cvs_buf_append(BUF *b, const void *data, size_t len)
  {
  	size_t left, rlen;
! 	void *bp, *bep;
  
  	bp = b->cb_cur + b->cb_len;
  	bep = b->cb_buf + b->cb_size;
--- 294,300 ----
  cvs_buf_append(BUF *b, const void *data, size_t len)
  {
  	size_t left, rlen;
! 	u_char *bp, *bep;
  
  	bp = b->cb_cur + b->cb_len;
  	bep = b->cb_buf + b->cb_size;
***************
*** 474,480 ****
  	void *tmp;
  	size_t diff;
  
! 	diff = b->cb_cur - (u_char *)b->cb_buf;
  	tmp = realloc(b->cb_buf, b->cb_size + len);
  	if (tmp == NULL) {
  		cvs_log(LP_ERRNO, "failed to grow buffer");
--- 474,480 ----
  	void *tmp;
  	size_t diff;
  
! 	diff = b->cb_cur - b->cb_buf;
  	tmp = realloc(b->cb_buf, b->cb_size + len);
  	if (tmp == NULL) {
  		cvs_log(LP_ERRNO, "failed to grow buffer");