diff options
| author | Dan Nicolaescu | 2010-07-04 00:50:25 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-07-04 00:50:25 -0700 |
| commit | 971de7fb158335fbda39525feb2d7776a26bc030 (patch) | |
| tree | 605333d85f16e35bb06baffcb66ac49f4ec0dce9 /src/termcap.c | |
| parent | b8463cbfbe2c5183cf40772df2746e58b787ddeb (diff) | |
| download | emacs-971de7fb158335fbda39525feb2d7776a26bc030.tar.gz emacs-971de7fb158335fbda39525feb2d7776a26bc030.zip | |
Convert (most) functions in src to standard C.
* src/alloc.c: Convert function definitions to standard C.
* src/atimer.c:
* src/bidi.c:
* src/bytecode.c:
* src/callint.c:
* src/callproc.c:
* src/casefiddle.c:
* src/casetab.c:
* src/category.c:
* src/ccl.c:
* src/character.c:
* src/charset.c:
* src/chartab.c:
* src/cmds.c:
* src/coding.c:
* src/composite.c:
* src/data.c:
* src/dbusbind.c:
* src/dired.c:
* src/dispnew.c:
* src/doc.c:
* src/doprnt.c:
* src/ecrt0.c:
* src/editfns.c:
* src/fileio.c:
* src/filelock.c:
* src/filemode.c:
* src/fns.c:
* src/font.c:
* src/fontset.c:
* src/frame.c:
* src/fringe.c:
* src/ftfont.c:
* src/ftxfont.c:
* src/gtkutil.c:
* src/indent.c:
* src/insdel.c:
* src/intervals.c:
* src/keymap.c:
* src/lread.c:
* src/macros.c:
* src/marker.c:
* src/md5.c:
* src/menu.c:
* src/minibuf.c:
* src/prefix-args.c:
* src/print.c:
* src/ralloc.c:
* src/regex.c:
* src/region-cache.c:
* src/scroll.c:
* src/search.c:
* src/sound.c:
* src/strftime.c:
* src/syntax.c:
* src/sysdep.c:
* src/termcap.c:
* src/terminal.c:
* src/terminfo.c:
* src/textprop.c:
* src/tparam.c:
* src/undo.c:
* src/unexelf.c:
* src/window.c:
* src/xfaces.c:
* src/xfns.c:
* src/xfont.c:
* src/xftfont.c:
* src/xgselect.c:
* src/xmenu.c:
* src/xrdb.c:
* src/xselect.c:
* src/xsettings.c:
* src/xsmfns.c:
* src/xterm.c: Likewise.
Diffstat (limited to 'src/termcap.c')
| -rw-r--r-- | src/termcap.c | 51 |
1 files changed, 16 insertions, 35 deletions
diff --git a/src/termcap.c b/src/termcap.c index 9b4a7f657f6..5a6d9483a51 100644 --- a/src/termcap.c +++ b/src/termcap.c | |||
| @@ -127,15 +127,14 @@ xrealloc (ptr, size) | |||
| 127 | for tgetnum, tgetflag and tgetstr to find. */ | 127 | for tgetnum, tgetflag and tgetstr to find. */ |
| 128 | static char *term_entry; | 128 | static char *term_entry; |
| 129 | 129 | ||
| 130 | static char *tgetst1 (); | 130 | static char *tgetst1 (char *ptr, char **area); |
| 131 | 131 | ||
| 132 | /* Search entry BP for capability CAP. | 132 | /* Search entry BP for capability CAP. |
| 133 | Return a pointer to the capability (in BP) if found, | 133 | Return a pointer to the capability (in BP) if found, |
| 134 | 0 if not found. */ | 134 | 0 if not found. */ |
| 135 | 135 | ||
| 136 | static char * | 136 | static char * |
| 137 | find_capability (bp, cap) | 137 | find_capability (register char *bp, register char *cap) |
| 138 | register char *bp, *cap; | ||
| 139 | { | 138 | { |
| 140 | for (; *bp; bp++) | 139 | for (; *bp; bp++) |
| 141 | if (bp[0] == ':' | 140 | if (bp[0] == ':' |
| @@ -146,8 +145,7 @@ find_capability (bp, cap) | |||
| 146 | } | 145 | } |
| 147 | 146 | ||
| 148 | int | 147 | int |
| 149 | tgetnum (cap) | 148 | tgetnum (char *cap) |
| 150 | char *cap; | ||
| 151 | { | 149 | { |
| 152 | register char *ptr = find_capability (term_entry, cap); | 150 | register char *ptr = find_capability (term_entry, cap); |
| 153 | if (!ptr || ptr[-1] != '#') | 151 | if (!ptr || ptr[-1] != '#') |
| @@ -156,8 +154,7 @@ tgetnum (cap) | |||
| 156 | } | 154 | } |
| 157 | 155 | ||
| 158 | int | 156 | int |
| 159 | tgetflag (cap) | 157 | tgetflag (char *cap) |
| 160 | char *cap; | ||
| 161 | { | 158 | { |
| 162 | register char *ptr = find_capability (term_entry, cap); | 159 | register char *ptr = find_capability (term_entry, cap); |
| 163 | return ptr && ptr[-1] == ':'; | 160 | return ptr && ptr[-1] == ':'; |
| @@ -169,9 +166,7 @@ tgetflag (cap) | |||
| 169 | If AREA is null, space is allocated with `malloc'. */ | 166 | If AREA is null, space is allocated with `malloc'. */ |
| 170 | 167 | ||
| 171 | char * | 168 | char * |
| 172 | tgetstr (cap, area) | 169 | tgetstr (char *cap, char **area) |
| 173 | char *cap; | ||
| 174 | char **area; | ||
| 175 | { | 170 | { |
| 176 | register char *ptr = find_capability (term_entry, cap); | 171 | register char *ptr = find_capability (term_entry, cap); |
| 177 | if (!ptr || (ptr[-1] != '=' && ptr[-1] != '~')) | 172 | if (!ptr || (ptr[-1] != '=' && ptr[-1] != '~')) |
| @@ -209,9 +204,7 @@ static const char esctab[] | |||
| 209 | or NULL if PTR is NULL. */ | 204 | or NULL if PTR is NULL. */ |
| 210 | 205 | ||
| 211 | static char * | 206 | static char * |
| 212 | tgetst1 (ptr, area) | 207 | tgetst1 (char *ptr, char **area) |
| 213 | char *ptr; | ||
| 214 | char **area; | ||
| 215 | { | 208 | { |
| 216 | register char *p, *r; | 209 | register char *p, *r; |
| 217 | register int c; | 210 | register int c; |
| @@ -357,10 +350,7 @@ static const int speeds[] = | |||
| 357 | #endif /* not emacs */ | 350 | #endif /* not emacs */ |
| 358 | 351 | ||
| 359 | void | 352 | void |
| 360 | tputs (str, nlines, outfun) | 353 | tputs (register char *str, int nlines, register int (*outfun) (/* ??? */)) |
| 361 | register char *str; | ||
| 362 | int nlines; | ||
| 363 | register int (*outfun) (); | ||
| 364 | { | 354 | { |
| 365 | register int padcount = 0; | 355 | register int padcount = 0; |
| 366 | register int speed; | 356 | register int speed; |
| @@ -432,10 +422,10 @@ struct termcap_buffer | |||
| 432 | 422 | ||
| 433 | /* Forward declarations of static functions. */ | 423 | /* Forward declarations of static functions. */ |
| 434 | 424 | ||
| 435 | static int scan_file (); | 425 | static int scan_file (char *str, int fd, register struct termcap_buffer *bufp); |
| 436 | static char *gobble_line (); | 426 | static char *gobble_line (int fd, register struct termcap_buffer *bufp, char *append_end); |
| 437 | static int compare_contin (); | 427 | static int compare_contin (register char *str1, register char *str2); |
| 438 | static int name_match (); | 428 | static int name_match (char *line, char *name); |
| 439 | 429 | ||
| 440 | #ifdef MSDOS /* MW, May 1993 */ | 430 | #ifdef MSDOS /* MW, May 1993 */ |
| 441 | static int | 431 | static int |
| @@ -460,8 +450,7 @@ valid_filename_p (fn) | |||
| 460 | in it, and some other value otherwise. */ | 450 | in it, and some other value otherwise. */ |
| 461 | 451 | ||
| 462 | int | 452 | int |
| 463 | tgetent (bp, name) | 453 | tgetent (char *bp, char *name) |
| 464 | char *bp, *name; | ||
| 465 | { | 454 | { |
| 466 | register char *termcap_name; | 455 | register char *termcap_name; |
| 467 | register int fd; | 456 | register int fd; |
| @@ -625,10 +614,7 @@ tgetent (bp, name) | |||
| 625 | or 0 if no entry is found in the file. */ | 614 | or 0 if no entry is found in the file. */ |
| 626 | 615 | ||
| 627 | static int | 616 | static int |
| 628 | scan_file (str, fd, bufp) | 617 | scan_file (char *str, int fd, register struct termcap_buffer *bufp) |
| 629 | char *str; | ||
| 630 | int fd; | ||
| 631 | register struct termcap_buffer *bufp; | ||
| 632 | { | 618 | { |
| 633 | register char *end; | 619 | register char *end; |
| 634 | 620 | ||
| @@ -665,8 +651,7 @@ scan_file (str, fd, bufp) | |||
| 665 | by termcap entry LINE. */ | 651 | by termcap entry LINE. */ |
| 666 | 652 | ||
| 667 | static int | 653 | static int |
| 668 | name_match (line, name) | 654 | name_match (char *line, char *name) |
| 669 | char *line, *name; | ||
| 670 | { | 655 | { |
| 671 | register char *tem; | 656 | register char *tem; |
| 672 | 657 | ||
| @@ -681,8 +666,7 @@ name_match (line, name) | |||
| 681 | } | 666 | } |
| 682 | 667 | ||
| 683 | static int | 668 | static int |
| 684 | compare_contin (str1, str2) | 669 | compare_contin (register char *str1, register char *str2) |
| 685 | register char *str1, *str2; | ||
| 686 | { | 670 | { |
| 687 | register int c1, c2; | 671 | register int c1, c2; |
| 688 | while (1) | 672 | while (1) |
| @@ -722,10 +706,7 @@ compare_contin (str1, str2) | |||
| 722 | thing as one line. The caller decides when a line is continued. */ | 706 | thing as one line. The caller decides when a line is continued. */ |
| 723 | 707 | ||
| 724 | static char * | 708 | static char * |
| 725 | gobble_line (fd, bufp, append_end) | 709 | gobble_line (int fd, register struct termcap_buffer *bufp, char *append_end) |
| 726 | int fd; | ||
| 727 | register struct termcap_buffer *bufp; | ||
| 728 | char *append_end; | ||
| 729 | { | 710 | { |
| 730 | register char *end; | 711 | register char *end; |
| 731 | register int nread; | 712 | register int nread; |