===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mg/line.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- src/usr.bin/mg/line.c	2005/11/18 17:35:17	1.27
+++ src/usr.bin/mg/line.c	2005/11/18 20:56:53	1.28
@@ -1,4 +1,4 @@
-/*	$OpenBSD: line.c,v 1.27 2005/11/18 17:35:17 kjell Exp $	*/
+/*	$OpenBSD: line.c,v 1.28 2005/11/18 20:56:53 deraadt Exp $	*/
 
 /* This file is in the public domain. */
 
@@ -48,10 +48,10 @@
  * Allocate a new line of size `used'.  lrealloc() can be called if the line
  * ever needs to grow beyond that.
  */
-LINE *
+struct line *
 lalloc(int used)
 {
-	LINE *lp;
+	struct line *lp;
 
 	if ((lp = malloc(sizeof(*lp))) == NULL)
 		return (NULL);
@@ -66,7 +66,7 @@
 }
 
 int
-lrealloc(LINE *lp, int newsize)
+lrealloc(struct line *lp, int newsize)
 {
 	char *tmp;
 
@@ -86,10 +86,10 @@
  * magic conditions described in the above comments don't hold here.
  */
 void
-lfree(LINE *lp)
+lfree(struct line *lp)
 {
-	BUFFER	*bp;
-	MGWIN	*wp;
+	struct buffer	*bp;
+	struct mgwin	*wp;
 
 	for (wp = wheadp; wp != NULL; wp = wp->w_wndp) {
 		if (wp->w_linep == lp)
@@ -132,7 +132,7 @@
 void
 lchange(int flag)
 {
-	MGWIN	*wp;
+	struct mgwin	*wp;
 
 	/* update mode lines if this is the first change. */
 	if ((curbp->b_flag & BFCHG) == 0) {
@@ -160,8 +160,8 @@
 int
 linsert_str(const char *s, int n)
 {
-	LINE	*lp1;
-	MGWIN	*wp;
+	struct line	*lp1;
+	struct mgwin	*wp;
 	RSIZE	 i;
 	int	 doto;
 
@@ -180,7 +180,7 @@
 
 	/* special case for the end */
 	if (lp1 == curbp->b_linep) {
-		LINE *lp2, *lp3;
+		struct line *lp2, *lp3;
 
 		/* now should only happen in empty buffer */
 		if (curwp->w_doto != 0)
@@ -250,8 +250,8 @@
 int
 linsert(int n, int c)
 {
-	LINE	*lp1;
-	MGWIN	*wp;
+	struct line	*lp1;
+	struct mgwin	*wp;
 	RSIZE	 i;
 	int	 doto;
 
@@ -270,7 +270,7 @@
 
 	/* special case for the end */
 	if (lp1 == curbp->b_linep) {
-		LINE *lp2, *lp3;
+		struct line *lp2, *lp3;
 
 		/* now should only happen in empty buffer */
 		if (curwp->w_doto != 0) {
@@ -331,11 +331,11 @@
 }
 
 int
-lnewline_at(LINE *lp1, int doto)
+lnewline_at(struct line *lp1, int doto)
 {
-	LINE	*lp2;
+	struct line	*lp2;
 	int	 nlen;
-	MGWIN	*wp;
+	struct mgwin	*wp;
 	int	 retval = TRUE;
 
 	lchange(WFHARD);
@@ -414,9 +414,9 @@
 int
 ldelete(RSIZE n, int kflag)
 {
-	LINE	*dotp;
+	struct line	*dotp;
 	RSIZE	 chunk;
-	MGWIN	*wp;
+	struct mgwin	*wp;
 	int	 doto;
 	char	*cp1, *cp2;
 
@@ -509,8 +509,8 @@
 int
 ldelnewline(void)
 {
-	LINE	*lp1, *lp2, *lp3;
-	MGWIN	*wp;
+	struct line	*lp1, *lp2, *lp3;
+	struct mgwin	*wp;
 
 	if (curbp->b_flag & BFREADONLY) {
 		ewprintf("Buffer is read only");