===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/ci.c,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- src/usr.bin/rcs/ci.c	2010/07/22 17:49:18	1.206
+++ src/usr.bin/rcs/ci.c	2010/07/23 21:46:05	1.207
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ci.c,v 1.206 2010/07/22 17:49:18 millert Exp $	*/
+/*	$OpenBSD: ci.c,v 1.207 2010/07/23 21:46:05 ray Exp $	*/
 /*
  * Copyright (c) 2005, 2006 Niall O'Higgins <niallo@openbsd.org>
  * All rights reserved.
@@ -136,7 +136,7 @@
 		case 'd':
 			if (rcs_optarg == NULL)
 				pb.date = DATE_MTIME;
-			else if ((pb.date = rcs_date_parse(rcs_optarg)) <= 0)
+			else if ((pb.date = date_parse(rcs_optarg)) <= 0)
 				errx(1, "invalid date");
 			break;
 		case 'f':
@@ -348,7 +348,7 @@
 	b1 = b2 = b3 = NULL;
 	path1 = path2 = NULL;
 
-	if ((b1 = rcs_buf_load(pb->filename, BUF_AUTOEXT)) == NULL) {
+	if ((b1 = buf_load(pb->filename, BUF_AUTOEXT)) == NULL) {
 		warnx("failed to load file: `%s'", pb->filename);
 		goto out;
 	}
@@ -359,21 +359,21 @@
 	}
 	b2 = rcs_kwexp_buf(b2, pb->file, pb->frev);
 
-	if ((b3 = rcs_buf_alloc(128, BUF_AUTOEXT)) == NULL) {
+	if ((b3 = buf_alloc(128, BUF_AUTOEXT)) == NULL) {
 		warnx("failed to allocated buffer for diff");
 		goto out;
 	}
 
 	(void)xasprintf(&path1, "%s/diff1.XXXXXXXXXX", rcs_tmpdir);
-	rcs_buf_write_stmp(b1, path1);
+	buf_write_stmp(b1, path1);
 
-	rcs_buf_free(b1);
+	buf_free(b1);
 	b1 = NULL;
 
 	(void)xasprintf(&path2, "%s/diff2.XXXXXXXXXX", rcs_tmpdir);
-	rcs_buf_write_stmp(b2, path2);
+	buf_write_stmp(b2, path2);
 
-	rcs_buf_free(b2);
+	buf_free(b2);
 	b2 = NULL;
 
 	diff_format = D_RCSDIFF;
@@ -383,11 +383,11 @@
 	return (b3);
 out:
 	if (b1 != NULL)
-		rcs_buf_free(b1);
+		buf_free(b1);
 	if (b2 != NULL)
-		rcs_buf_free(b2);
+		buf_free(b2);
 	if (b3 != NULL)
-		rcs_buf_free(b3);
+		buf_free(b3);
 	if (path1 != NULL)
 		xfree(path1);
 	if (path2 != NULL)
@@ -451,7 +451,7 @@
 	pb->frev = pb->file->rf_head;
 
 	/* Load file contents */
-	if ((bp = rcs_buf_load(pb->filename, BUF_AUTOEXT)) == NULL)
+	if ((bp = buf_load(pb->filename, BUF_AUTOEXT)) == NULL)
 		return (-1);
 
 	/* If this is a zero-ending RCSNUM eg 4.0, increment it (eg to 4.1) */
@@ -511,7 +511,7 @@
 	 * If -f is not specified and there are no differences, tell
 	 * the user and revert to latest version.
 	 */
-	if (!(pb->flags & FORCE) && (rcs_buf_len(pb->deltatext) < 1)) {
+	if (!(pb->flags & FORCE) && (buf_len(pb->deltatext) < 1)) {
 		if (checkin_revert(pb) == -1)
 			return (-1);
 		else
@@ -627,7 +627,7 @@
 	}
 
 	/* Load file contents */
-	if ((bp = rcs_buf_load(pb->filename, BUF_AUTOEXT)) == NULL)
+	if ((bp = buf_load(pb->filename, BUF_AUTOEXT)) == NULL)
 		return (-1);
 
 	/* Get default values from working copy if -k specified */
@@ -867,11 +867,11 @@
 	char *kwstr;
 	unsigned char *c, *end, *start;
 
-	end = rcs_buf_get(data) + rcs_buf_len(data) - 1;
+	end = buf_get(data) + buf_len(data) - 1;
 	kwstr = NULL;
 
-	left = rcs_buf_len(data);
-	for (c = rcs_buf_get(data);
+	left = buf_len(data);
+	for (c = buf_get(data);
 	    c <= end && (c = memchr(c, '$', left)) != NULL;
 	    left = end - c + 1) {
 		size_t len;
@@ -918,12 +918,12 @@
 		}
 
 		len = c - start + 1;
-		buf = rcs_buf_alloc(len + 1, 0);
-		rcs_buf_append(buf, start, len);
+		buf = buf_alloc(len + 1, 0);
+		buf_append(buf, start, len);
 
 		/* XXX - Not binary safe. */
-		rcs_buf_putc(buf, '\0');
-		checkin_parsekeyword(rcs_buf_get(buf), rev, date, author, state);
+		buf_putc(buf, '\0');
+		checkin_parsekeyword(buf_get(buf), rev, date, author, state);
 loopend:;
 	}
 	if (kwstr == NULL)
@@ -997,7 +997,7 @@
 		if (i < 5)
 			break;
 		(void)xasprintf(&datestring, "%s %s", tokens[3], tokens[4]);
-		if ((*date = rcs_date_parse(datestring)) <= 0)
+		if ((*date = date_parse(datestring)) <= 0)
 			errx(1, "could not parse date");
 		xfree(datestring);
 
@@ -1024,7 +1024,7 @@
 		if (i < 3)
 			break;
 		(void)xasprintf(&datestring, "%s %s", tokens[1], tokens[2]);
-		if ((*date = rcs_date_parse(datestring)) <= 0)
+		if ((*date = date_parse(datestring)) <= 0)
 			errx(1, "could not parse date");
 		xfree(datestring);
 		break;