From 1f271323f8bd6b3d12fbc31fd432b4903cf633de Mon Sep 17 00:00:00 2001 From: Thiago Farina Date: Sun, 8 Aug 2010 23:03:42 -0300 Subject: [PATCH] uemacs: convert typedef struct KILL to struct kill. Signed-off-by: Thiago Farina Signed-off-by: Linus Torvalds --- edef.h | 4 ++-- estruct.h | 8 ++++---- globals.c | 4 ++-- line.c | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/edef.h b/edef.h index cc44a42..8731165 100644 --- a/edef.h +++ b/edef.h @@ -64,8 +64,8 @@ extern int abortc; /* current abort command char */ extern int quotec; /* quote char during mlreply() */ extern int tabmask; extern char *cname[]; /* names of colors */ -extern KILL *kbufp; /* current kill buffer chunk pointer */ -extern KILL *kbufh; /* kill buffer header pointer */ +extern struct kill *kbufp; /* current kill buffer chunk pointer */ +extern struct kill *kbufh; /* kill buffer header pointer */ extern int kused; /* # of bytes used in KB */ extern struct window *swindow; /* saved window pointer */ extern int cryptflag; /* currently encrypting? */ diff --git a/estruct.h b/estruct.h index e3c6686..aacc217 100644 --- a/estruct.h +++ b/estruct.h @@ -609,17 +609,17 @@ struct name_bind { int (*n_func)(int, int); /* function name is bound to */ }; -/* The editor holds deleted text chunks in the KILL buffer. The +/* The editor holds deleted text chunks in the struct kill buffer. The kill buffer is logically a stream of ascii characters, however due to its unpredicatable size, it gets implemented as a linked list of chunks. (The d_ prefix is for "deleted" text, as k_ was taken up by the keycode structure) */ -typedef struct KILL { - struct KILL *d_next; /* link to next chunk, NULL if last */ +struct kill { + struct kill *d_next; /* link to next chunk, NULL if last */ char d_chunk[KBLOCK]; /* deleted text */ -} KILL; +}; /* When emacs' command interpetor needs to get a variable's name, rather than it's value, it is passed back as a VDESC variable diff --git a/globals.c b/globals.c index 85aeae3..a0ee12e 100644 --- a/globals.c +++ b/globals.c @@ -58,8 +58,8 @@ char *cname[] = { /* names of colors */ , "HIGH" #endif }; -KILL *kbufp = NULL; /* current kill buffer chunk pointer */ -KILL *kbufh = NULL; /* kill buffer header pointer */ +struct kill *kbufp = NULL; /* current kill buffer chunk pointer */ +struct kill *kbufh = NULL; /* kill buffer header pointer */ int kused = KBLOCK; /* # of bytes used in kill buffer */ struct window *swindow = NULL; /* saved window pointer */ int cryptflag = FALSE; /* currently encrypting? */ diff --git a/line.c b/line.c index 4519f42..c41e045 100644 --- a/line.c +++ b/line.c @@ -551,7 +551,7 @@ int ldelnewline(void) */ void kdelete(void) { - KILL *kp; /* ptr to scan kill buffer chunk list */ + struct kill *kp; /* ptr to scan kill buffer chunk list */ if (kbufh != NULL) { @@ -577,11 +577,11 @@ void kdelete(void) */ int kinsert(int c) { - KILL *nchunk; /* ptr to newly malloced chunk */ + struct kill *nchunk; /* ptr to newly malloced chunk */ /* check to see if we need a new chunk */ if (kused >= KBLOCK) { - if ((nchunk = (KILL *) malloc(sizeof(KILL))) == NULL) + if ((nchunk = (struct kill *)malloc(sizeof(struct kill))) == NULL) return (FALSE); if (kbufh == NULL) /* set head ptr if first time */ kbufh = nchunk; @@ -607,7 +607,7 @@ int yank(int f, int n) int c; int i; char *sp; /* pointer into string to insert */ - KILL *kp; /* pointer into kill buffer */ + struct kill *kp; /* pointer into kill buffer */ if (curbp->b_mode & MDVIEW) /* don't allow this command if */ return (rdonly()); /* we are in read only mode */