rfivet/uemacs
1
0
Fork 0
mirror of https://github.com/rfivet/uemacs.git synced 2024-06-23 02:05:59 +00:00
Code Releases Activity

uemacs: convert typdef struct LINE to struct line.

Browse Source 
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Thiago Farina <tfransosi@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Thiago Farina 2010-04-17 19:38:09 -04:00 committed by Linus Torvalds
parent 7281ae375e
commit c7e30a9636
16 changed files with 115 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
basic.c
View File

@ -33,7 +33,7 @@ int gotobol(int f, int n)
*/ */
int backchar(int f, int n) int backchar(int f, int n)
{ {
LINE *lp; struct line *lp;
if (n < 0) if (n < 0)
return (forwchar(f, -n)); return (forwchar(f, -n));
@ -146,7 +146,7 @@ int gotoeob(int f, int n)
*/ */
int forwline(int f, int n) int forwline(int f, int n)
{ {
LINE *dlp; struct line *dlp;
if (n < 0) if (n < 0)
return (backline(f, -n)); return (backline(f, -n));
@ -183,7 +183,7 @@ int forwline(int f, int n)
*/ */
int backline(int f, int n) int backline(int f, int n)
{ {
LINE *dlp; struct line *dlp;
if (n < 0) if (n < 0)
return (forwline(f, -n)); return (forwline(f, -n));
@ -315,11 +315,11 @@ int gotoeop(int f, int n)
#endif #endif
/* /*
* This routine, given a pointer to a LINE, and the current cursor goal * This routine, given a pointer to a struct line, and the current cursor goal
* column, return the best choice for the offset. The offset is returned. * column, return the best choice for the offset. The offset is returned.
* Used by "C-N" and "C-P". * Used by "C-N" and "C-P".
*/ */
int getgoal(LINE *dlp) int getgoal(struct line *dlp)
{ {
int c; int c;
int col; int col;
@ -352,7 +352,7 @@ int getgoal(LINE *dlp)
*/ */
int forwpage(int f, int n) int forwpage(int f, int n)
{ {
LINE *lp; struct line *lp;
if (f == FALSE) { if (f == FALSE) {
#if SCROLLCODE #if SCROLLCODE
@ -394,7 +394,7 @@ int forwpage(int f, int n)
*/ */
int backpage(int f, int n) int backpage(int f, int n)
{ {
LINE *lp; struct line *lp;
if (f == FALSE) { if (f == FALSE) {
#if SCROLLCODE #if SCROLLCODE
@ -448,7 +448,7 @@ int setmark(int f, int n)
*/ */
int swapmark(int f, int n) int swapmark(int f, int n)
{ {
LINE *odotp; struct line *odotp;
int odoto; int odoto;
if (curwp->w_markp == NULL) { if (curwp->w_markp == NULL) {

8
buffer.c
View File

@ -271,7 +271,7 @@ int makelist(int iflag)
char *cp2; char *cp2;
int c; int c;
struct buffer *bp; struct buffer *bp;
LINE *lp; struct line *lp;
int s; int s;
int i; int i;
long nbytes; /* # of bytes in current buffer */ long nbytes; /* # of bytes in current buffer */
@ -394,7 +394,7 @@ void ltoa(char *buf, int width, long num)
*/ */
int addline(char *text) int addline(char *text)
{ {
LINE *lp; struct line *lp;
int i; int i;
int ntext; int ntext;
@ -447,7 +447,7 @@ struct buffer *bfind(char *bname, int cflag, int bflag)
{ {
struct buffer *bp; struct buffer *bp;
struct buffer *sb; /* buffer to insert after */ struct buffer *sb; /* buffer to insert after */
LINE *lp; struct line *lp;
bp = bheadp; bp = bheadp;
while (bp != NULL) { while (bp != NULL) {
@ -513,7 +513,7 @@ struct buffer *bfind(char *bname, int cflag, int bflag)
*/ */
int bclear(struct buffer *bp) int bclear(struct buffer *bp)
{ {
LINE *lp; struct line *lp;
int s; int s;
if ((bp->b_flag & BFINVS) == 0 /* Not scratch buffer. */ if ((bp->b_flag & BFINVS) == 0 /* Not scratch buffer. */

16
display.c
View File

@ -361,7 +361,7 @@ int update(int force)
*/ */
static int reframe(window_t *wp) static int reframe(window_t *wp)
{ {
LINE *lp, *lp0; struct line *lp, *lp0;
int i = 0; int i = 0;
/* if not a requested reframe, check for a needed one */ /* if not a requested reframe, check for a needed one */
@ -451,7 +451,7 @@ static int reframe(window_t *wp)
*/ */
static void updone(window_t *wp) static void updone(window_t *wp)
{ {
LINE *lp; /* line to update */ struct line *lp; /* line to update */
int sline; /* physical screen line to update */ int sline; /* physical screen line to update */
int i; int i;
@ -484,7 +484,7 @@ static void updone(window_t *wp)
*/ */
static void updall(window_t *wp) static void updall(window_t *wp)
{ {
LINE *lp; /* line to update */ struct line *lp; /* line to update */
int sline; /* physical screen line to update */ int sline; /* physical screen line to update */
int i; int i;
@ -522,7 +522,7 @@ static void updall(window_t *wp)
*/ */
void updpos(void) void updpos(void)
{ {
LINE *lp; struct line *lp;
int c; int c;
int i; int i;
@ -564,7 +564,7 @@ void updpos(void)
void upddex(void) void upddex(void)
{ {
window_t *wp; window_t *wp;
LINE *lp; struct line *lp;
int i, j; int i, j;
wp = wheadp; wp = wheadp;
@ -853,7 +853,7 @@ static int endofline(char *s, int n)
static void updext(void) static void updext(void)
{ {
int rcursor; /* real cursor location */ int rcursor; /* real cursor location */
LINE *lp; /* pointer to current line */ struct line *lp; /* pointer to current line */
int j; /* index into line */ int j; /* index into line */
/* calculate what column the real cursor will end up in */ /* calculate what column the real cursor will end up in */
@ -1216,7 +1216,7 @@ static void modeline(window_t *wp)
} }
{ /* determine if top line, bottom line, or both are visible */ { /* determine if top line, bottom line, or both are visible */
LINE *lp = wp->w_linep; struct line *lp = wp->w_linep;
int rows = wp->w_ntrows; int rows = wp->w_ntrows;
char *msg = NULL; char *msg = NULL;
@ -1239,7 +1239,7 @@ static void modeline(window_t *wp)
} }
} }
if (!msg) { if (!msg) {
LINE *lp; struct line *lp;
int numlines, predlines, ratio; int numlines, predlines, ratio;
lp = lforw(bp->b_linep); lp = lforw(bp->b_linep);

4
edef.h
View File

@ -111,7 +111,7 @@ extern struct buffer *blistp; /* Buffer for C-X C-B */
extern struct buffer *bfind(char *bname, int cflag, int bflag); /* Lookup a buffer by name */ extern struct buffer *bfind(char *bname, int cflag, int bflag); /* Lookup a buffer by name */
extern window_t *wpopup(void); /* Pop up window creation */ extern window_t *wpopup(void); /* Pop up window creation */
extern LINE *lalloc(int); /* Allocate a line */ extern struct line *lalloc(int); /* Allocate a line */
extern char sres[NBUFN]; /* current screen resolution */ extern char sres[NBUFN]; /* current screen resolution */
extern char pat[]; /* Search pattern */ extern char pat[]; /* Search pattern */
extern char tap[]; /* Reversed pattern array. */ extern char tap[]; /* Reversed pattern array. */
@ -120,7 +120,7 @@ extern char rpat[]; /* replacement pattern */
extern unsigned int matchlen; extern unsigned int matchlen;
extern unsigned int mlenold; extern unsigned int mlenold;
extern char *patmatch; extern char *patmatch;
extern LINE *matchline; extern struct line *matchline;
extern int matchoff; extern int matchoff;
#if MAGIC #if MAGIC

6
efunc.h
View File

@ -28,7 +28,7 @@ extern int killpara(int f, int n);
extern int wordcount(int f, int n); extern int wordcount(int f, int n);
/* line.c */ /* line.c */
extern void lfree(LINE *lp); extern void lfree(struct line *lp);
extern void lchange(int flag); extern void lchange(int flag);
extern int insspace(int f, int n); extern int insspace(int f, int n);
extern int linstr(char *instr); extern int linstr(char *instr);
@ -78,7 +78,7 @@ extern int forwline(int f, int n);
extern int backline(int f, int n); extern int backline(int f, int n);
extern int gotobop(int f, int n); extern int gotobop(int f, int n);
extern int gotoeop(int f, int n); extern int gotoeop(int f, int n);
extern int getgoal(LINE *dlp); extern int getgoal(struct line *dlp);
extern int forwpage(int f, int n); extern int forwpage(int f, int n);
extern int backpage(int f, int n); extern int backpage(int f, int n);
extern int setmark(int f, int n); extern int setmark(int f, int n);
@ -326,7 +326,7 @@ extern int sreplace(int f, int n);
extern int qreplace(int f, int n); extern int qreplace(int f, int n);
extern int delins(int dlength, char *instr, int use_meta); extern int delins(int dlength, char *instr, int use_meta);
extern int expandp(char *srcstr, char *deststr, int maxlength); extern int expandp(char *srcstr, char *deststr, int maxlength);
extern int boundry(LINE *curline, int curoff, int dir); extern int boundry(struct line *curline, int curoff, int dir);
extern void mcclear(void); extern void mcclear(void);
extern void rmcclear(void); extern void rmcclear(void);

32
estruct.h
View File

@ -431,10 +431,10 @@
typedef struct window { typedef struct window {
struct window *w_wndp; /* Next window */ struct window *w_wndp; /* Next window */
struct buffer *w_bufp; /* Buffer displayed in window */ struct buffer *w_bufp; /* Buffer displayed in window */
struct LINE *w_linep; /* Top line in the window */ struct line *w_linep; /* Top line in the window */
struct LINE *w_dotp; /* Line containing "." */ struct line *w_dotp; /* Line containing "." */
short w_doto; /* Byte offset for "." */ short w_doto; /* Byte offset for "." */
struct LINE *w_markp; /* Line containing "mark" */ struct line *w_markp; /* Line containing "mark" */
short w_marko; /* Byte offset for "mark" */ short w_marko; /* Byte offset for "mark" */
char w_toprow; /* Origin 0 top row of window */ char w_toprow; /* Origin 0 top row of window */
char w_ntrows; /* # of rows of text in window */ char w_ntrows; /* # of rows of text in window */
@ -472,11 +472,11 @@ typedef struct window {
*/ */
struct buffer { struct buffer {
struct buffer *b_bufp; /* Link to next struct buffer */ struct buffer *b_bufp; /* Link to next struct buffer */
struct LINE *b_dotp; /* Link to "." LINE structure */ struct line *b_dotp; /* Link to "." struct line structure */
short b_doto; /* Offset of "." in above LINE */ short b_doto; /* Offset of "." in above struct line */
struct LINE *b_markp; /* The same as the above two, */ struct line *b_markp; /* The same as the above two, */
short b_marko; /* but for the "mark" */ short b_marko; /* but for the "mark" */
struct LINE *b_linep; /* Link to the header LINE */ struct line *b_linep; /* Link to the header struct line */
char b_active; /* window activated flag */ char b_active; /* window activated flag */
char b_nwnd; /* Count of windows on buffer */ char b_nwnd; /* Count of windows on buffer */
char b_flag; /* Flags */ char b_flag; /* Flags */
@ -511,26 +511,26 @@ struct buffer {
* characters, is kept in a region structure. Used by the region commands. * characters, is kept in a region structure. Used by the region commands.
*/ */
typedef struct { typedef struct {
struct LINE *r_linep; /* Origin LINE address. */ struct line *r_linep; /* Origin struct line address. */
short r_offset; /* Origin LINE offset. */ short r_offset; /* Origin struct line offset. */
long r_size; /* Length in characters. */ long r_size; /* Length in characters. */
} REGION; } REGION;
/* /*
* All text is kept in circularly linked lists of "LINE" structures. These * All text is kept in circularly linked lists of "struct line" structures. These
* begin at the header line (which is the blank line beyond the end of the * begin at the header line (which is the blank line beyond the end of the
* buffer). This line is pointed to by the "struct buffer". Each line contains a the * buffer). This line is pointed to by the "struct buffer". Each line contains a the
* number of bytes in the line (the "used" size), the size of the text array, * number of bytes in the line (the "used" size), the size of the text array,
* and the text. The end of line is not stored as a byte; it's implied. Future * and the text. The end of line is not stored as a byte; it's implied. Future
* additions will include update hints, and a list of marks into the line. * additions will include update hints, and a list of marks into the line.
*/ */
typedef struct LINE { struct line {
struct LINE *l_fp; /* Link to the next line */ struct line *l_fp; /* Link to the next line */
struct LINE *l_bp; /* Link to the previous line */ struct line *l_bp; /* Link to the previous line */
short l_size; /* Allocated size */ short l_size; /* Allocated size */
short l_used; /* Used size */ short l_used; /* Used size */
char l_text[1]; /* A bunch of characters. */ char l_text[1]; /* A bunch of characters. */
} LINE; };
#define lforw(lp) ((lp)->l_fp) #define lforw(lp) ((lp)->l_fp)
#define lback(lp) ((lp)->l_bp) #define lback(lp) ((lp)->l_bp)
@ -642,8 +642,8 @@ typedef struct VDESC {
*/ */
typedef struct WHBLOCK { typedef struct WHBLOCK {
LINE *w_begin; /* ptr to !while statement */ struct line *w_begin; /* ptr to !while statement */
LINE *w_end; /* ptr to the !endwhile statement */ struct line *w_end; /* ptr to the !endwhile statement */
int w_type; /* block type */ int w_type; /* block type */
struct WHBLOCK *w_next; /* next while */ struct WHBLOCK *w_next; /* next while */
} WHBLOCK; } WHBLOCK;

8
exec.c
View File

@ -420,10 +420,10 @@ int execbuf(int f, int n)
int dobuf(struct buffer *bp) int dobuf(struct buffer *bp)
{ {
int status; /* status return */ int status; /* status return */
LINE *lp; /* pointer to line to execute */ struct line *lp; /* pointer to line to execute */
LINE *hlp; /* pointer to line header */ struct line *hlp; /* pointer to line header */
LINE *glp; /* line to goto */ struct line *glp; /* line to goto */
LINE *mp; /* Macro line storage temp */ struct line *mp; /* Macro line storage temp */
int dirnum; /* directive index */ int dirnum; /* directive index */
int linlen; /* length of line to execute */ int linlen; /* length of line to execute */
int i; /* index */ int i; /* index */

16
file.c
View File

@ -142,7 +142,7 @@ static int resetkey(void)
int getfile(char *fname, int lockfl) int getfile(char *fname, int lockfl)
{ {
struct buffer *bp; struct buffer *bp;
LINE *lp; struct line *lp;
int i; int i;
int s; int s;
char bname[NBUFN]; /* buffer name to put file */ char bname[NBUFN]; /* buffer name to put file */
@ -207,8 +207,8 @@ int getfile(char *fname, int lockfl)
*/ */
int readin(char *fname, int lockfl) int readin(char *fname, int lockfl)
{ {
LINE *lp1; struct line *lp1;
LINE *lp2; struct line *lp2;
int i; int i;
window_t *wp; window_t *wp;
struct buffer *bp; struct buffer *bp;
@ -460,14 +460,14 @@ int filesave(int f, int n)
* This function performs the details of file * This function performs the details of file
* writing. Uses the file management routines in the * writing. Uses the file management routines in the
* "fileio.c" package. The number of lines written is * "fileio.c" package. The number of lines written is
* displayed. Sadly, it looks inside a LINE; provide * displayed. Sadly, it looks inside a struct line; provide
* a macro for this. Most of the grief is error * a macro for this. Most of the grief is error
* checking of some sort. * checking of some sort.
*/ */
int writeout(char *fn) int writeout(char *fn)
{ {
int s; int s;
LINE *lp; struct line *lp;
int nline; int nline;
#if CRYPT #if CRYPT
@ -547,9 +547,9 @@ int filename(int f, int n)
*/ */
int ifile(char *fname) int ifile(char *fname)
{ {
LINE *lp0; struct line *lp0;
LINE *lp1; struct line *lp1;
LINE *lp2; struct line *lp2;
int i; int i;
struct buffer *bp; struct buffer *bp;
int s; int s;

2
globals.c
View File

@ -120,7 +120,7 @@ char rpat[NPAT]; /* replacement pattern */
unsigned int matchlen = 0; unsigned int matchlen = 0;
unsigned int mlenold = 0; unsigned int mlenold = 0;
char *patmatch = NULL; char *patmatch = NULL;
LINE *matchline = NULL; struct line *matchline = NULL;
int matchoff = 0; int matchoff = 0;
#if MAGIC #if MAGIC

10
isearch.c
View File

@ -49,7 +49,7 @@ static int cmd_reexecute = -1; /* > 0 if re-executing command */
*/ */
int risearch(int f, int n) int risearch(int f, int n)
{ {
LINE *curline; /* Current line on entry */ struct line *curline; /* Current line on entry */
int curoff; /* Current offset on entry */ int curoff; /* Current offset on entry */
/* remember the initial . on entry: */ /* remember the initial . on entry: */
@ -83,7 +83,7 @@ int risearch(int f, int n)
*/ */
int fisearch(int f, int n) int fisearch(int f, int n)
{ {
LINE *curline; /* Current line on entry */ struct line *curline; /* Current line on entry */
int curoff; /* Current offset on entry */ int curoff; /* Current offset on entry */
/* remember the initial . on entry: */ /* remember the initial . on entry: */
@ -144,7 +144,7 @@ int isearch(int f, int n)
int c; /* current input character */ int c; /* current input character */
int expc; /* function expanded input char */ int expc; /* function expanded input char */
char pat_save[NPAT]; /* Saved copy of the old pattern str */ char pat_save[NPAT]; /* Saved copy of the old pattern str */
LINE *curline; /* Current line on entry */ struct line *curline; /* Current line on entry */
int curoff; /* Current offset on entry */ int curoff; /* Current offset on entry */
int init_direction; /* The initial search direction */ int init_direction; /* The initial search direction */
@ -278,7 +278,7 @@ int isearch(int f, int n)
*/ */
int checknext(char chr, char *patrn, int dir) /* Check next character in search string */ int checknext(char chr, char *patrn, int dir) /* Check next character in search string */
{ {
LINE *curline; /* current line during scan */ struct line *curline; /* current line during scan */
int curoff; /* position within current line */ int curoff; /* position within current line */
int buffchar; /* character at current position */ int buffchar; /* character at current position */
int status; /* how well things go */ int status; /* how well things go */
@ -353,7 +353,7 @@ int match_pat(char *patrn) /* See if the pattern string matches string at "."
{ {
int i; /* Generic loop index/offset */ int i; /* Generic loop index/offset */
int buffchar; /* character at current position */ int buffchar; /* character at current position */
LINE *curline; /* current line during scan */ struct line *curline; /* current line during scan */
int curoff; /* position within current line */ int curoff; /* position within current line */
/* setup the local scan pointer to current "." */ /* setup the local scan pointer to current "." */

32
line.c
View File

@ -1,4 +1,4 @@
/* LINE.C /* line.c
* *
* The functions in this file are a general set of line management utilities. * The functions in this file are a general set of line management utilities.
* They are the only routines that touch the text. They also touch the buffer * They are the only routines that touch the text. They also touch the buffer
@ -19,20 +19,20 @@
#include "efunc.h" #include "efunc.h"
/* /*
* This routine allocates a block of memory large enough to hold a LINE * This routine allocates a block of memory large enough to hold a struct line
* containing "used" characters. The block is always rounded up a bit. Return * containing "used" characters. The block is always rounded up a bit. Return
* a pointer to the new block, or NULL if there isn't any memory left. Print a * a pointer to the new block, or NULL if there isn't any memory left. Print a
* message in the message line if no space. * message in the message line if no space.
*/ */
LINE *lalloc(int used) struct line *lalloc(int used)
{ {
LINE *lp; struct line *lp;
int size; int size;
size = (used + NBLOCK - 1) & ~(NBLOCK - 1); size = (used + NBLOCK - 1) & ~(NBLOCK - 1);
if (size == 0) /* Assume that an empty */ if (size == 0) /* Assume that an empty */
size = NBLOCK; /* line is for type-in. */ size = NBLOCK; /* line is for type-in. */
if ((lp = (LINE *) malloc(sizeof(LINE) + size)) == NULL) { if ((lp = (struct line *)malloc(sizeof(struct line) + size)) == NULL) {
mlwrite("(OUT OF MEMORY)"); mlwrite("(OUT OF MEMORY)");
return (NULL); return (NULL);
} }
@ -47,7 +47,7 @@ LINE *lalloc(int used)
* might be in. Release the memory. The buffers are updated too; the magic * might be in. Release the memory. The buffers are updated too; the magic
* conditions described in the above comments don't hold here. * conditions described in the above comments don't hold here.
*/ */
void lfree(LINE *lp) void lfree(struct line *lp)
{ {
struct buffer *bp; struct buffer *bp;
window_t *wp; window_t *wp;
@ -160,9 +160,9 @@ int linsert(int n, int c)
{ {
char *cp1; char *cp1;
char *cp2; char *cp2;
LINE *lp1; struct line *lp1;
LINE *lp2; struct line *lp2;
LINE *lp3; struct line *lp3;
int doto; int doto;
int i; int i;
window_t *wp; window_t *wp;
@ -284,8 +284,8 @@ int lnewline(void)
{ {
char *cp1; char *cp1;
char *cp2; char *cp2;
LINE *lp1; struct line *lp1;
LINE *lp2; struct line *lp2;
int doto; int doto;
window_t *wp; window_t *wp;
@ -346,7 +346,7 @@ int ldelete(long n, int kflag)
{ {
char *cp1; char *cp1;
char *cp2; char *cp2;
LINE *dotp; struct line *dotp;
int doto; int doto;
int chunk; int chunk;
window_t *wp; window_t *wp;
@ -412,7 +412,7 @@ int ldelete(long n, int kflag)
*/ */
char *getctext(void) char *getctext(void)
{ {
LINE *lp; /* line to copy */ struct line *lp; /* line to copy */
int size; /* length of line to return */ int size; /* length of line to return */
char *sp; /* string pointer into line */ char *sp; /* string pointer into line */
char *dp; /* string pointer into returned line */ char *dp; /* string pointer into returned line */
@ -469,9 +469,9 @@ int ldelnewline(void)
{ {
char *cp1; char *cp1;
char *cp2; char *cp2;
LINE *lp1; struct line *lp1;
LINE *lp2; struct line *lp2;
LINE *lp3; struct line *lp3;
window_t *wp; window_t *wp;
if (curbp->b_mode & MDVIEW) /* don't allow this command if */ if (curbp->b_mode & MDVIEW) /* don't allow this command if */

22
random.c
View File

@ -32,7 +32,7 @@ int setfillcol(int f, int n)
*/ */
int showcpos(int f, int n) int showcpos(int f, int n)
{ {
LINE *lp; /* current line */ struct line *lp; /* current line */
long numchars; /* # of chars in file */ long numchars; /* # of chars in file */
int numlines; /* # of lines in file */ int numlines; /* # of lines in file */
long predchars; /* # chars preceding point */ long predchars; /* # chars preceding point */
@ -97,7 +97,7 @@ int showcpos(int f, int n)
int getcline(void) int getcline(void)
{ /* get the current line number */ { /* get the current line number */
LINE *lp; /* current line */ struct line *lp; /* current line */
int numlines; /* # of lines before point */ int numlines; /* # of lines before point */
/* starting at the beginning of the buffer */ /* starting at the beginning of the buffer */
@ -183,7 +183,7 @@ int setccol(int pos)
*/ */
int twiddle(int f, int n) int twiddle(int f, int n)
{ {
LINE *dotp; struct line *dotp;
int doto; int doto;
int cl; int cl;
int cr; int cr;
@ -375,7 +375,7 @@ int entab(int f, int n)
*/ */
int trim(int f, int n) int trim(int f, int n)
{ {
LINE *lp; /* current line pointer */ struct line *lp; /* current line pointer */
int offset; /* original line offset position */ int offset; /* original line offset position */
int length; /* current length */ int length; /* current length */
int inc; /* increment to next line [sgn(n)] */ int inc; /* increment to next line [sgn(n)] */
@ -530,7 +530,7 @@ int insbrace(int n, int c)
int oc; /* caractere oppose a c */ int oc; /* caractere oppose a c */
int i, count; int i, count;
int target; /* column brace should go after */ int target; /* column brace should go after */
LINE *oldlp; struct line *oldlp;
int oldoff; int oldoff;
/* if we aren't at the beginning of the line... */ /* if we aren't at the beginning of the line... */
@ -683,8 +683,8 @@ int inspound(void)
*/ */
int deblank(int f, int n) int deblank(int f, int n)
{ {
LINE *lp1; struct line *lp1;
LINE *lp2; struct line *lp2;
long nld; long nld;
if (curbp->b_mode & MDVIEW) /* don't allow this command if */ if (curbp->b_mode & MDVIEW) /* don't allow this command if */
@ -793,7 +793,7 @@ int backdel(int f, int n)
*/ */
int killtext(int f, int n) int killtext(int f, int n)
{ {
LINE *nextp; struct line *nextp;
long chunk; long chunk;
if (curbp->b_mode & MDVIEW) /* don't allow this command if */ if (curbp->b_mode & MDVIEW) /* don't allow this command if */
@ -1037,7 +1037,7 @@ int writemsg(int f, int n)
*/ */
int getfence(int f, int n) int getfence(int f, int n)
{ {
LINE *oldlp; /* original line pointer */ struct line *oldlp; /* original line pointer */
int oldoff; /* and offset */ int oldoff; /* and offset */
int sdir; /* direction of search (1/-1) */ int sdir; /* direction of search (1/-1) */
int count; /* current fence level count */ int count; /* current fence level count */
@ -1137,9 +1137,9 @@ int getfence(int f, int n)
*/ */
int fmatch(int ch) int fmatch(int ch)
{ {
LINE *oldlp; /* original line pointer */ struct line *oldlp; /* original line pointer */
int oldoff; /* and offset */ int oldoff; /* and offset */
LINE *toplp; /* top line in current window */ struct line *toplp; /* top line in current window */
int count; /* current fence level count */ int count; /* current fence level count */
char opench; /* open fence */ char opench; /* open fence */
char c; /* current character in scan */ char c; /* current character in scan */

10
region.c
View File

@ -45,7 +45,7 @@ int killregion(int f, int n)
*/ */
int copyregion(int f, int n) int copyregion(int f, int n)
{ {
LINE *linep; struct line *linep;
int loffs; int loffs;
int s; int s;
REGION region; REGION region;
@ -83,7 +83,7 @@ int copyregion(int f, int n)
*/ */
int lowerregion(int f, int n) int lowerregion(int f, int n)
{ {
LINE *linep; struct line *linep;
int loffs; int loffs;
int c; int c;
int s; int s;
@ -120,7 +120,7 @@ int lowerregion(int f, int n)
*/ */
int upperregion(int f, int n) int upperregion(int f, int n)
{ {
LINE *linep; struct line *linep;
int loffs; int loffs;
int c; int c;
int s; int s;
@ -160,8 +160,8 @@ int upperregion(int f, int n)
*/ */
int getregion(REGION *rp) int getregion(REGION *rp)
{ {
LINE *flp; struct line *flp;
LINE *blp; struct line *blp;
long fsize; long fsize;
long bsize; long bsize;

28
search.c
View File

@ -62,10 +62,10 @@
#include "edef.h" #include "edef.h"
#include "efunc.h" #include "efunc.h"
static int amatch(MC *mcptr, int direct, LINE **pcwline, int *pcwoff); static int amatch(MC *mcptr, int direct, struct line **pcwline, int *pcwoff);
static int readpattern(char *prompt, char *apat, int srch); static int readpattern(char *prompt, char *apat, int srch);
static int replaces(int kind, int f, int n); static int replaces(int kind, int f, int n);
static int nextch(LINE **pcurline, int *pcuroff, int dir); static int nextch(struct line **pcurline, int *pcuroff, int dir);
static int mcstr(void); static int mcstr(void);
static int rmcstr(void); static int rmcstr(void);
static int mceq(int bc, MC *mt); static int mceq(int bc, MC *mt);
@ -287,7 +287,7 @@ int backhunt(int f, int n)
*/ */
int mcscanner(MC *mcpatrn, int direct, int beg_or_end) int mcscanner(MC *mcpatrn, int direct, int beg_or_end)
{ {
LINE *curline; /* current line during scan */ struct line *curline; /* current line during scan */
int curoff; /* position within current line */ int curoff; /* position within current line */
/* If we are going in reverse, then the 'end' is actually /* If we are going in reverse, then the 'end' is actually
@ -351,13 +351,13 @@ int mcscanner(MC *mcpatrn, int direct, int beg_or_end)
* *
* MC *mcptr; string to scan for * MC *mcptr; string to scan for
* int direct; which way to go. * int direct; which way to go.
* LINE **pcwline; current line during scan * struct line **pcwline; current line during scan
* int *pcwoff; position within current line * int *pcwoff; position within current line
*/ */
static int amatch(MC *mcptr, int direct, LINE **pcwline, int *pcwoff) static int amatch(MC *mcptr, int direct, struct line **pcwline, int *pcwoff)
{ {
int c; /* character at current position */ int c; /* character at current position */
LINE *curline; /* current line during scan */ struct line *curline; /* current line during scan */
int curoff; /* position within current line */ int curoff; /* position within current line */
int nchars; int nchars;
@ -498,9 +498,9 @@ int scanner(const char *patrn, int direct, int beg_or_end)
{ {
int c; /* character at current position */ int c; /* character at current position */
const char *patptr; /* pointer into pattern */ const char *patptr; /* pointer into pattern */
LINE *curline; /* current line during scan */ struct line *curline; /* current line during scan */
int curoff; /* position within current line */ int curoff; /* position within current line */
LINE *scanline; /* current line during scanning */ struct line *scanline; /* current line during scanning */
int scanoff; /* position in scanned line */ int scanoff; /* position in scanned line */
/* If we are going in reverse, then the 'end' is actually /* If we are going in reverse, then the 'end' is actually
@ -641,7 +641,7 @@ void savematch(void)
{ {
char *ptr; /* pointer to last match string */ char *ptr; /* pointer to last match string */
int j; int j;
LINE *curline; /* line of last match */ struct line *curline; /* line of last match */
int curoff; /* offset " " */ int curoff; /* offset " " */
/* Free any existing match string, then /* Free any existing match string, then
@ -718,9 +718,9 @@ static int replaces(int kind, int f, int n)
int nlrepl; /* was a replace done on the last line? */ int nlrepl; /* was a replace done on the last line? */
char c; /* input char for query */ char c; /* input char for query */
char tpat[NPAT]; /* temporary to hold search pattern */ char tpat[NPAT]; /* temporary to hold search pattern */
LINE *origline; /* original "." position */ struct line *origline; /* original "." position */
int origoff; /* and offset (for . query option) */ int origoff; /* and offset (for . query option) */
LINE *lastline; /* position of last replace and */ struct line *lastline; /* position of last replace and */
int lastoff; /* offset (for 'u' query option) */ int lastoff; /* offset (for 'u' query option) */
if (curbp->b_mode & MDVIEW) /* don't allow this command if */ if (curbp->b_mode & MDVIEW) /* don't allow this command if */
@ -1013,7 +1013,7 @@ int expandp(char *srcstr, char *deststr, int maxlength)
* in future, a' la VMS EDT. At the moment, just return TRUE or * in future, a' la VMS EDT. At the moment, just return TRUE or
* FALSE depending on if a boundry is hit (ouch). * FALSE depending on if a boundry is hit (ouch).
*/ */
int boundry(LINE *curline, int curoff, int dir) int boundry(struct line *curline, int curoff, int dir)
{ {
int border; int border;
@ -1035,9 +1035,9 @@ int boundry(LINE *curline, int curoff, int dir)
* the current character and move, reverse searches move and * the current character and move, reverse searches move and
* look at the character. * look at the character.
*/ */
static int nextch(LINE **pcurline, int *pcuroff, int dir) static int nextch(struct line **pcurline, int *pcuroff, int dir)
{ {
LINE *curline; struct line *curline;
int curoff; int curoff;
int c; int c;

12
window.c
View File

@ -140,7 +140,7 @@ int mvdnwind(int f, int n)
*/ */
int mvupwind(int f, int n) int mvupwind(int f, int n)
{ {
LINE *lp; struct line *lp;
int i; int i;
lp = curwp->w_linep; lp = curwp->w_linep;
@ -185,7 +185,7 @@ int mvupwind(int f, int n)
int onlywind(int f, int n) int onlywind(int f, int n)
{ {
window_t *wp; window_t *wp;
LINE *lp; struct line *lp;
int i; int i;
while (wheadp != curwp) { while (wheadp != curwp) {
@ -310,7 +310,7 @@ int delwind(int f, int n)
int splitwind(int f, int n) int splitwind(int f, int n)
{ {
window_t *wp; window_t *wp;
LINE *lp; struct line *lp;
int ntru; int ntru;
int ntrl; int ntrl;
int ntrd; int ntrd;
@ -392,7 +392,7 @@ int splitwind(int f, int n)
int enlargewind(int f, int n) int enlargewind(int f, int n)
{ {
window_t *adjwp; window_t *adjwp;
LINE *lp; struct line *lp;
int i; int i;
if (n < 0) if (n < 0)
@ -443,7 +443,7 @@ int enlargewind(int f, int n)
int shrinkwind(int f, int n) int shrinkwind(int f, int n)
{ {
window_t *adjwp; window_t *adjwp;
LINE *lp; struct line *lp;
int i; int i;
if (n < 0) if (n < 0)
@ -697,7 +697,7 @@ int newwidth(int f, int n)
int getwpos(void) int getwpos(void)
{ /* get screen offset of current line in current window */ { /* get screen offset of current line in current window */
int sline; /* screen line from top of window */ int sline; /* screen line from top of window */
LINE *lp; /* scannile line pointer */ struct line *lp; /* scannile line pointer */
/* search down the line we want */ /* search down the line we want */
lp = curwp->w_linep; lp = curwp->w_linep;

8
word.c
View File

@ -241,7 +241,7 @@ int capword(int f, int n)
*/ */
int delfword(int f, int n) int delfword(int f, int n)
{ {
LINE *dotp; /* original cursor line */ struct line *dotp; /* original cursor line */
int doto; /* and row */ int doto; /* and row */
int c; /* temp char */ int c; /* temp char */
long size; /* # of chars to delete */ long size; /* # of chars to delete */
@ -405,7 +405,7 @@ int fillpara(int f, int n)
int newlength; /* tentative new line length */ int newlength; /* tentative new line length */
int eopflag; /* Are we at the End-Of-Paragraph? */ int eopflag; /* Are we at the End-Of-Paragraph? */
int firstflag; /* first word? (needs no space) */ int firstflag; /* first word? (needs no space) */
LINE *eopline; /* pointer to line just past EOP */ struct line *eopline; /* pointer to line just past EOP */
int dotflag; /* was the last char a period? */ int dotflag; /* was the last char a period? */
char wbuf[NSTRING]; /* buffer for current word */ char wbuf[NSTRING]; /* buffer for current word */
@ -502,7 +502,7 @@ int justpara(int f, int n)
int newlength; /* tentative new line length */ int newlength; /* tentative new line length */
int eopflag; /* Are we at the End-Of-Paragraph? */ int eopflag; /* Are we at the End-Of-Paragraph? */
int firstflag; /* first word? (needs no space) */ int firstflag; /* first word? (needs no space) */
LINE *eopline; /* pointer to line just past EOP */ struct line *eopline; /* pointer to line just past EOP */
char wbuf[NSTRING]; /* buffer for current word */ char wbuf[NSTRING]; /* buffer for current word */
int leftmarg; /* left marginal */ int leftmarg; /* left marginal */
@ -640,7 +640,7 @@ int killpara(int f, int n)
*/ */
int wordcount(int f, int n) int wordcount(int f, int n)
{ {
LINE *lp; /* current line to scan */ struct line *lp; /* current line to scan */
int offset; /* current char to scan */ int offset; /* current char to scan */
long size; /* size of region left to count */ long size; /* size of region left to count */
int ch; /* current character to scan */ int ch; /* current character to scan */