aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Farina <tfransosi@gmail.com>2010-07-02 16:37:45 -0300
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-04 20:14:34 -0700
commit724c4efc5fbc1c49361a75a86139e27b2e96c506 (patch)
tree9fefe2cf26661fa1cceb2be8614634c97438052d
parent8403b1d597fd574e934e52401750827cf1c00de6 (diff)
downloaduemacs-724c4efc5fbc1c49361a75a86139e27b2e96c506.tar.gz
uemacs: convert typedef struct NBIND to struct name_bind.
Signed-off-by: Thiago Farina <tfransosi@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--bind.c6
-rw-r--r--edef.h2
-rw-r--r--efunc.h2
-rw-r--r--estruct.h4
-rw-r--r--input.c6
-rw-r--r--names.c2
6 files changed, 11 insertions, 11 deletions
diff --git a/bind.c b/bind.c
index 97b4e28..68b8a03 100644
--- a/bind.c
+++ b/bind.c
@@ -277,7 +277,7 @@ int buildlist(int type, char *mstring)
{
window_t *wp; /* scanning pointer to windows */
struct key_tab *ktp; /* pointer into the command table */
- NBIND *nptr; /* pointer into the name binding table */
+ struct name_bind *nptr; /* pointer into the name binding table */
struct buffer *bp; /* buffer to put binding list into */
int cpos; /* current position to use in outseq */
char outseq[80]; /* output buffer for keystroke sequence */
@@ -616,7 +616,7 @@ int (*getbind(int c))(int, int)
*/
char *getfname(fn_t func)
{
- NBIND *nptr; /* pointer into the name binding table */
+ struct name_bind *nptr; /* pointer into the name binding table */
/* skim through the table, looking for a match */
nptr = &names[0];
@@ -636,7 +636,7 @@ char *getfname(fn_t func)
*/
int (*fncmatch(char *fname)) (int, int)
{
- NBIND *ffp; /* pointer to entry in name binding table */
+ struct name_bind *ffp; /* pointer to entry in name binding table */
/* scan through the table, returning any match */
ffp = &names[0];
diff --git a/edef.h b/edef.h
index e3211ee..ddabd50 100644
--- a/edef.h
+++ b/edef.h
@@ -33,7 +33,7 @@ extern char *modename[]; /* text names of modes */
extern char *mode2name[]; /* text names of modes */
extern char modecode[]; /* letters to represent modes */
extern struct key_tab keytab[]; /* key bind to functions table */
-extern NBIND names[]; /* name to function table */
+extern struct name_bind names[]; /* name to function table */
extern int gmode; /* global editor mode */
extern int gflags; /* global control flag */
extern int gfcolor; /* global forgrnd color (white) */
diff --git a/efunc.h b/efunc.h
index f51f2fb..dbccde8 100644
--- a/efunc.h
+++ b/efunc.h
@@ -375,7 +375,7 @@ extern int unlock(char *fname);
extern void lckerror(char *errstr);
/* names.c */
-extern NBIND names[];
+extern struct name_bind names[];
/* pklock.c */
extern char *dolock(char *fname);
diff --git a/estruct.h b/estruct.h
index 333a4d9..dfffe0b 100644
--- a/estruct.h
+++ b/estruct.h
@@ -604,10 +604,10 @@ struct key_tab {
};
/* Structure for the name binding table. */
-typedef struct {
+struct name_bind {
char *n_name; /* name of function key */
int (*n_func)(int, int); /* function name is bound to */
-} NBIND;
+};
/* The editor holds deleted text chunks in the KILL buffer. The
kill buffer is logically a stream of ascii characters, however
diff --git a/input.c b/input.c
index c04db11..b6a5ccb 100644
--- a/input.c
+++ b/input.c
@@ -108,9 +108,9 @@ fn_t getname(void)
int cpos; /* current column on screen output */
int c;
char *sp; /* pointer to string for output */
- NBIND *ffp; /* first ptr to entry in name binding table */
- NBIND *cffp; /* current ptr to entry in name binding table */
- NBIND *lffp; /* last ptr to entry in name binding table */
+ struct name_bind *ffp; /* first ptr to entry in name binding table */
+ struct name_bind *cffp; /* current ptr to entry in name binding table */
+ struct name_bind *lffp; /* last ptr to entry in name binding table */
char buf[NSTRING]; /* buffer to hold tentative command name */
/* starting at the beginning of the string buffer */
diff --git a/names.c b/names.c
index 510f080..e731167 100644
--- a/names.c
+++ b/names.c
@@ -9,7 +9,7 @@
#include "edef.h"
#include "efunc.h"
-NBIND names[] = {
+struct name_bind names[] = {
{"abort-command", ctrlg},
{"add-mode", setmode},
{"add-global-mode", setgmode},