===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mg/file.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- src/usr.bin/mg/file.c	2005/11/13 07:24:48	1.44
+++ src/usr.bin/mg/file.c	2005/11/18 20:56:52	1.45
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.c,v 1.44 2005/11/13 07:24:48 kjell Exp $	*/
+/*	$OpenBSD: file.c,v 1.45 2005/11/18 20:56:52 deraadt Exp $	*/
 
 /* This file is in the public domain. */
 
@@ -41,7 +41,7 @@
 int
 filevisit(int f, int n)
 {
-	BUFFER	*bp;
+	struct buffer	*bp;
 	char	 fname[NFILEN], *bufp, *adjf, *slash;
 	int	 status;
 
@@ -86,7 +86,7 @@
 int
 filevisitalt(int f, int n)
 {
-	BUFFER	*bp;
+	struct buffer	*bp;
 	char	 fname[NFILEN], *bufp, *adjf, *slash;
 	int	 status;
 
@@ -145,8 +145,8 @@
 int
 poptofile(int f, int n)
 {
-	BUFFER	*bp;
-	MGWIN	*wp;
+	struct buffer	*bp;
+	struct mgwin	*wp;
 	char	 fname[NFILEN], *adjf, *bufp;
 	int	 status;
 
@@ -176,10 +176,10 @@
  * Given a file name, either find the buffer it uses, or create a new
  * empty buffer to put it in.
  */
-BUFFER *
+struct buffer *
 findbuffer(char *fn)
 {
-	BUFFER		*bp;
+	struct buffer		*bp;
 	char		 bname[NBUFN], fname[NBUFN];
 	unsigned int	 count, remain, i;
 
@@ -211,7 +211,7 @@
 int
 readin(char *fname)
 {
-	MGWIN	*wp;
+	struct mgwin	*wp;
 	int	 status, i, ro = FALSE;
 	PF	*ael;
 
@@ -288,10 +288,10 @@
 int
 insertfile(char *fname, char *newname, int replacebuf)
 {
-	BUFFER	*bp;
-	LINE	*lp1, *lp2;
-	LINE	*olp;			/* line we started at */
-	MGWIN	*wp;
+	struct buffer	*bp;
+	struct line	*lp1, *lp2;
+	struct line	*olp;			/* line we started at */
+	struct mgwin	*wp;
 	int	 nbytes, s, nline, siz, x = -1, x2;
 	int	 opos;			/* offset we started at */
 
@@ -540,7 +540,7 @@
  * the value of makebackup.
  */
 int
-buffsave(BUFFER *bp)
+buffsave(struct buffer *bp)
 {
 	int	 s;
 
@@ -615,7 +615,7 @@
  * "fileio.c" package. Most of the grief is checking of some sort.
  */
 int
-writeout(BUFFER *bp, char *fn)
+writeout(struct buffer *bp, char *fn)
 {
 	int	 s;
 
@@ -639,9 +639,9 @@
  * mode line updated.
  */
 void
-upmodes(BUFFER *bp)
+upmodes(struct buffer *bp)
 {
-	MGWIN	*wp;
+	struct mgwin	*wp;
 
 	for (wp = wheadp; wp != NULL; wp = wp->w_wndp)
 		if (bp == NULL || curwp->w_bufp == bp)