===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/buf.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/rcs/buf.c	2006/07/08 09:25:44	1.6
--- src/usr.bin/rcs/buf.c	2006/08/02 03:28:50	1.7
***************
*** 1,4 ****
! /*	$OpenBSD: buf.c,v 1.6 2006/07/08 09:25:44 ray Exp $	*/
  /*
   * Copyright (c) 2003 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: buf.c,v 1.7 2006/08/02 03:28:50 ray Exp $	*/
  /*
   * Copyright (c) 2003 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 178,184 ****
   * bytes of data found at <src>.  If the buffer was not created with
   * BUF_AUTOEXT, as many bytes as possible will be copied in the buffer.
   */
! ssize_t
  rcs_buf_set(BUF *b, const void *src, size_t len, size_t off)
  {
  	size_t rlen = 0;
--- 178,184 ----
   * bytes of data found at <src>.  If the buffer was not created with
   * BUF_AUTOEXT, as many bytes as possible will be copied in the buffer.
   */
! size_t
  rcs_buf_set(BUF *b, const void *src, size_t len, size_t off)
  {
  	size_t rlen = 0;
***************
*** 251,257 ****
   * will get resized to an appropriate size to accept all data.
   * Returns the number of bytes successfully appended to the buffer.
   */
! ssize_t
  rcs_buf_append(BUF *b, const void *data, size_t len)
  {
  	size_t left, rlen;
--- 251,257 ----
   * will get resized to an appropriate size to accept all data.
   * Returns the number of bytes successfully appended to the buffer.
   */
! size_t
  rcs_buf_append(BUF *b, const void *data, size_t len)
  {
  	size_t left, rlen;
***************
*** 280,300 ****
   * rcs_buf_fappend()
   *
   */
! ssize_t
  rcs_buf_fappend(BUF *b, const char *fmt, ...)
  {
! 	ssize_t ret;
  	char *str;
  	va_list vap;
  
  	va_start(vap, fmt);
! 	ret = vasprintf(&str, fmt, vap);
  	va_end(vap);
  
! 	if (ret == -1)
  		errx(1, "rcs_buf_fappend: failed to format data");
  
! 	ret = rcs_buf_append(b, str, (size_t)ret);
  	xfree(str);
  	return (ret);
  }
--- 280,301 ----
   * rcs_buf_fappend()
   *
   */
! size_t
  rcs_buf_fappend(BUF *b, const char *fmt, ...)
  {
! 	size_t ret;
! 	int n;
  	char *str;
  	va_list vap;
  
  	va_start(vap, fmt);
! 	n = vasprintf(&str, fmt, vap);
  	va_end(vap);
  
! 	if (n == -1)
  		errx(1, "rcs_buf_fappend: failed to format data");
  
! 	ret = rcs_buf_append(b, str, n);
  	xfree(str);
  	return (ret);
  }