rfivet/uemacs
1
0
Fork 0
mirror of https://github.com/rfivet/uemacs.git synced 2024-09-29 00:35:55 -04:00
Code Releases Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/editors/uemacs/uemacs

Browse Source
This commit is contained in:
Linus Torvalds 2010-11-02 09:05:21 -04:00
commit 85b4f0af1a
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
efunc.h
View File

@ -258,7 +258,7 @@ extern int storeproc(int f, int n);
extern int execproc(int f, int n); extern int execproc(int f, int n);
extern int execbuf(int f, int n); extern int execbuf(int f, int n);
extern int dobuf(struct buffer *bp); extern int dobuf(struct buffer *bp);
extern void freewhile(WHBLOCK *wp); extern void freewhile(struct while_block *wp);
extern int execfile(int f, int n); extern int execfile(int f, int n);
extern int dofile(char *fname); extern int dofile(char *fname);
extern int cbuf(int f, int n, int bufnum); extern int cbuf(int f, int n, int bufnum);

6
estruct.h
View File

@ -623,12 +623,12 @@ typedef struct VDESC {
the following structure the following structure
*/ */
typedef struct WHBLOCK { struct while_block {
struct line *w_begin; /* ptr to !while statement */ struct line *w_begin; /* ptr to !while statement */
struct 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 while_block *w_next; /* next while */
} WHBLOCK; };
#define BTWHILE 1 #define BTWHILE 1
#define BTBREAK 2 #define BTBREAK 2

14
exec.c
View File

@ -430,9 +430,9 @@ int dobuf(struct buffer *bp)
int c; /* temp character */ int c; /* temp character */
int force; /* force TRUE result? */ int force; /* force TRUE result? */
struct window *wp; /* ptr to windows to scan */ struct window *wp; /* ptr to windows to scan */
WHBLOCK *whlist; /* ptr to !WHILE list */ struct while_block *whlist; /* ptr to !WHILE list */
WHBLOCK *scanner; /* ptr during scan */ struct while_block *scanner; /* ptr during scan */
WHBLOCK *whtemp; /* temporary ptr to a WHBLOCK */ struct while_block *whtemp; /* temporary ptr to a struct while_block */
char *einit; /* initial value of eline */ char *einit; /* initial value of eline */
char *eline; /* text of line to execute */ char *eline; /* text of line to execute */
char tkn[NSTRING]; /* buffer to evaluate an expresion in */ char tkn[NSTRING]; /* buffer to evaluate an expresion in */
@ -465,7 +465,7 @@ int dobuf(struct buffer *bp)
/* if is a while directive, make a block... */ /* if is a while directive, make a block... */
if (eline[0] == '!' && eline[1] == 'w' && eline[2] == 'h') { if (eline[0] == '!' && eline[1] == 'w' && eline[2] == 'h') {
whtemp = (WHBLOCK *) malloc(sizeof(WHBLOCK)); whtemp = (struct while_block *)malloc(sizeof(struct while_block));
if (whtemp == NULL) { if (whtemp == NULL) {
noram:mlwrite noram:mlwrite
("%%Out of memory during while scan"); ("%%Out of memory during while scan");
@ -487,7 +487,7 @@ int dobuf(struct buffer *bp)
("%%!BREAK outside of any !WHILE loop"); ("%%!BREAK outside of any !WHILE loop");
goto failexit; goto failexit;
} }
whtemp = (WHBLOCK *) malloc(sizeof(WHBLOCK)); whtemp = (struct while_block *)malloc(sizeof(struct while_block));
if (whtemp == NULL) if (whtemp == NULL)
goto noram; goto noram;
whtemp->w_begin = lp; whtemp->w_begin = lp;
@ -832,9 +832,9 @@ int dobuf(struct buffer *bp)
/* /*
* free a list of while block pointers * free a list of while block pointers
* *
* WHBLOCK *wp; head of structure to free * struct while_block *wp; head of structure to free
*/ */
void freewhile(WHBLOCK *wp) void freewhile(struct while_block *wp)
{ {
if (wp == NULL) if (wp == NULL)
return; return;