oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

rename STATUS -> el_STATUS to avoid conflict with STATUS in

Browse Source 
arpa/nameser.h


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10691 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2001-09-13 01:19:54 +00:00
parent 68b19277e1
commit d325e96d1c
1 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
lib/editline/editline.c
View File

@@ -47,9 +47,9 @@ RCSID("$Id$");
/* /*
** Command status codes. ** Command status codes.
*/ */
typedef enum _STATUS { typedef enum _el_STATUS {
CSdone, CSeof, CSmove, CSdispatch, CSstay CSdone, CSeof, CSmove, CSdispatch, CSstay
} STATUS; } el_STATUS;
/* /*
** The type of case-changing to perform. ** The type of case-changing to perform.
@@ -63,7 +63,7 @@ typedef enum _CASE {
*/ */
typedef struct _KEYMAP { typedef struct _KEYMAP {
unsigned char Key; unsigned char Key;
STATUS (*Function)(); el_STATUS (*Function)();
} KEYMAP; } KEYMAP;
/* /*
@@ -316,7 +316,7 @@ reposition()
} }
static void static void
left(STATUS Change) left(el_STATUS Change)
{ {
TTYback(); TTYback();
if (Point) { if (Point) {
@@ -332,14 +332,14 @@ left(STATUS Change)
} }
static void static void
right(STATUS Change) right(el_STATUS Change)
{ {
TTYshow(Line[Point]); TTYshow(Line[Point]);
if (Change == CSmove) if (Change == CSmove)
Point++; Point++;
} }
static STATUS static el_STATUS
ring_bell() ring_bell()
{ {
TTYput('\07'); TTYput('\07');
@@ -347,7 +347,7 @@ ring_bell()
return CSstay; return CSstay;
} }
static STATUS static el_STATUS
do_macro(unsigned char c) do_macro(unsigned char c)
{ {
unsigned char name[4]; unsigned char name[4];
@@ -364,8 +364,8 @@ do_macro(unsigned char c)
return CSstay; return CSstay;
} }
static STATUS static el_STATUS
do_forward(STATUS move) do_forward(el_STATUS move)
{ {
int i; int i;
unsigned char *p; unsigned char *p;
@@ -388,7 +388,7 @@ do_forward(STATUS move)
return CSstay; return CSstay;
} }
static STATUS static el_STATUS
do_case(CASE type) do_case(CASE type)
{ {
int i; int i;
@@ -416,13 +416,13 @@ do_case(CASE type)
return CSstay; return CSstay;
} }
static STATUS static el_STATUS
case_down_word() case_down_word()
{ {
return do_case(TOlower); return do_case(TOlower);
} }
static STATUS static el_STATUS
case_up_word() case_up_word()
{ {
return do_case(TOupper); return do_case(TOupper);
@@ -463,7 +463,7 @@ clear_line()
Line[0] = '\0'; Line[0] = '\0';
} }
static STATUS static el_STATUS
insert_string(unsigned char *p) insert_string(unsigned char *p)
{ {
size_t len; size_t len;
@@ -507,7 +507,7 @@ prev_hist()
return H.Pos == 0 ? NULL : H.Lines[--H.Pos]; return H.Pos == 0 ? NULL : H.Lines[--H.Pos];
} }
static STATUS static el_STATUS
do_insert_hist(unsigned char *p) do_insert_hist(unsigned char *p)
{ {
if (p == NULL) if (p == NULL)
@@ -519,7 +519,7 @@ do_insert_hist(unsigned char *p)
return insert_string(p); return insert_string(p);
} }
static STATUS static el_STATUS
do_hist(unsigned char *(*move)()) do_hist(unsigned char *(*move)())
{ {
unsigned char *p; unsigned char *p;
@@ -533,25 +533,25 @@ do_hist(unsigned char *(*move)())
return do_insert_hist(p); return do_insert_hist(p);
} }
static STATUS static el_STATUS
h_next() h_next()
{ {
return do_hist(next_hist); return do_hist(next_hist);
} }
static STATUS static el_STATUS
h_prev() h_prev()
{ {
return do_hist(prev_hist); return do_hist(prev_hist);
} }
static STATUS static el_STATUS
h_first() h_first()
{ {
return do_insert_hist(H.Lines[H.Pos = 0]); return do_insert_hist(H.Lines[H.Pos = 0]);
} }
static STATUS static el_STATUS
h_last() h_last()
{ {
return do_insert_hist(H.Lines[H.Pos = H.Size - 1]); return do_insert_hist(H.Lines[H.Pos = H.Size - 1]);
@@ -612,7 +612,7 @@ search_hist(unsigned char *search, unsigned char *(*move)())
return NULL; return NULL;
} }
static STATUS static el_STATUS
h_search() h_search()
{ {
static int Searching; static int Searching;
@@ -638,7 +638,7 @@ h_search()
return do_insert_hist(p); return do_insert_hist(p);
} }
static STATUS static el_STATUS
fd_char() fd_char()
{ {
int i; int i;
@@ -669,7 +669,7 @@ save_yank(int begin, int i)
} }
} }
static STATUS static el_STATUS
delete_string(int count) delete_string(int count)
{ {
int i; int i;
@@ -711,7 +711,7 @@ delete_string(int count)
return CSmove; return CSmove;
} }
static STATUS static el_STATUS
bk_char() bk_char()
{ {
int i; int i;
@@ -726,7 +726,7 @@ bk_char()
return CSstay; return CSstay;
} }
static STATUS static el_STATUS
bk_del_char() bk_del_char()
{ {
int i; int i;
@@ -741,7 +741,7 @@ bk_del_char()
return delete_string(i); return delete_string(i);
} }
static STATUS static el_STATUS
redisplay() redisplay()
{ {
TTYputs(NEWLINE); TTYputs(NEWLINE);
@@ -750,7 +750,7 @@ redisplay()
return CSmove; return CSmove;
} }
static STATUS static el_STATUS
kill_line() kill_line()
{ {
int i; int i;
@@ -776,10 +776,10 @@ kill_line()
return CSstay; return CSstay;
} }
static STATUS static el_STATUS
insert_char(int c) insert_char(int c)
{ {
STATUS s; el_STATUS s;
unsigned char buff[2]; unsigned char buff[2];
unsigned char *p; unsigned char *p;
unsigned char *q; unsigned char *q;
@@ -802,7 +802,7 @@ insert_char(int c)
return s; return s;
} }
static STATUS static el_STATUS
meta() meta()
{ {
unsigned int c; unsigned int c;
@@ -838,10 +838,10 @@ meta()
return ring_bell(); return ring_bell();
} }
static STATUS static el_STATUS
emacs(unsigned int c) emacs(unsigned int c)
{ {
STATUS s; el_STATUS s;
KEYMAP *kp; KEYMAP *kp;
if (ISMETA(c)) { if (ISMETA(c)) {
@@ -859,7 +859,7 @@ emacs(unsigned int c)
return s; return s;
} }
static STATUS static el_STATUS
TTYspecial(unsigned int c) TTYspecial(unsigned int c)
{ {
if (ISMETA(c)) if (ISMETA(c))
@@ -999,7 +999,7 @@ add_history(char *p)
} }
static STATUS static el_STATUS
beg_line() beg_line()
{ {
if (Point) { if (Point) {
@@ -1009,13 +1009,13 @@ beg_line()
return CSstay; return CSstay;
} }
static STATUS static el_STATUS
del_char() del_char()
{ {
return delete_string(Repeat == NO_ARG ? 1 : Repeat); return delete_string(Repeat == NO_ARG ? 1 : Repeat);
} }
static STATUS static el_STATUS
end_line() end_line()
{ {
if (Point != End) { if (Point != End) {
@@ -1047,13 +1047,13 @@ find_word()
return new; return new;
} }
static STATUS static el_STATUS
c_complete() c_complete()
{ {
unsigned char *p; unsigned char *p;
unsigned char *word; unsigned char *word;
int unique; int unique;
STATUS s; el_STATUS s;
word = find_word(); word = find_word();
p = (unsigned char *)rl_complete((char *)word, &unique); p = (unsigned char *)rl_complete((char *)word, &unique);
@@ -1069,7 +1069,7 @@ c_complete()
return ring_bell(); return ring_bell();
} }
static STATUS static el_STATUS
c_possible() c_possible()
{ {
unsigned char **av; unsigned char **av;
@@ -1090,14 +1090,14 @@ c_possible()
return ring_bell(); return ring_bell();
} }
static STATUS static el_STATUS
accept_line() accept_line()
{ {
Line[End] = '\0'; Line[End] = '\0';
return CSdone; return CSdone;
} }
static STATUS static el_STATUS
transpose() transpose()
{ {
unsigned char c; unsigned char c;
@@ -1115,7 +1115,7 @@ transpose()
return CSstay; return CSstay;
} }
static STATUS static el_STATUS
quote() quote()
{ {
unsigned int c; unsigned int c;
@@ -1123,7 +1123,7 @@ quote()
return (c = TTYget()) == EOF ? CSeof : insert_char((int)c); return (c = TTYget()) == EOF ? CSeof : insert_char((int)c);
} }
static STATUS static el_STATUS
wipe() wipe()
{ {
int i; int i;
@@ -1141,14 +1141,14 @@ wipe()
return delete_string(Mark - Point); return delete_string(Mark - Point);
} }
static STATUS static el_STATUS
mk_set() mk_set()
{ {
Mark = Point; Mark = Point;
return CSstay; return CSstay;
} }
static STATUS static el_STATUS
exchange() exchange()
{ {
unsigned int c; unsigned int c;
@@ -1164,7 +1164,7 @@ exchange()
return CSstay; return CSstay;
} }
static STATUS static el_STATUS
yank() yank()
{ {
if (Yanked && *Yanked) if (Yanked && *Yanked)
@@ -1172,7 +1172,7 @@ yank()
return CSstay; return CSstay;
} }
static STATUS static el_STATUS
copy_region() copy_region()
{ {
if (Mark > End) if (Mark > End)
@@ -1186,7 +1186,7 @@ copy_region()
return CSstay; return CSstay;
} }
static STATUS static el_STATUS
move_to_char() move_to_char()
{ {
unsigned int c; unsigned int c;
@@ -1203,13 +1203,13 @@ move_to_char()
return CSstay; return CSstay;
} }
static STATUS static el_STATUS
fd_word() fd_word()
{ {
return do_forward(CSmove); return do_forward(CSmove);
} }
static STATUS static el_STATUS
fd_kill_word() fd_kill_word()
{ {
int i; int i;
@@ -1223,7 +1223,7 @@ fd_kill_word()
return CSstay; return CSstay;
} }
static STATUS static el_STATUS
bk_word() bk_word()
{ {
int i; int i;
@@ -1244,7 +1244,7 @@ bk_word()
return CSstay; return CSstay;
} }
static STATUS static el_STATUS
bk_kill_word() bk_kill_word()
{ {
bk_word(); bk_word();
@@ -1297,12 +1297,12 @@ argify(unsigned char *line, unsigned char ***avp)
return ac; return ac;
} }
static STATUS static el_STATUS
last_argument() last_argument()
{ {
unsigned char **av; unsigned char **av;
unsigned char *p; unsigned char *p;
STATUS s; el_STATUS s;
int ac; int ac;
if (H.Size == 1 || (p = H.Lines[H.Size - 2]) == NULL) if (H.Size == 1 || (p = H.Lines[H.Size - 2]) == NULL)