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/charset.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/charset.c')
| -rw-r--r-- | src/charset.c | 64 |
1 files changed, 16 insertions, 48 deletions
diff --git a/src/charset.c b/src/charset.c index 787d000d99a..40214ea3817 100644 --- a/src/charset.c +++ b/src/charset.c | |||
| @@ -267,11 +267,7 @@ struct charset_map_entries | |||
| 267 | */ | 267 | */ |
| 268 | 268 | ||
| 269 | static void | 269 | static void |
| 270 | load_charset_map (charset, entries, n_entries, control_flag) | 270 | load_charset_map (struct charset *charset, struct charset_map_entries *entries, int n_entries, int control_flag) |
| 271 | struct charset *charset; | ||
| 272 | struct charset_map_entries *entries; | ||
| 273 | int n_entries; | ||
| 274 | int control_flag; | ||
| 275 | { | 271 | { |
| 276 | Lisp_Object vec, table; | 272 | Lisp_Object vec, table; |
| 277 | unsigned max_code = CHARSET_MAX_CODE (charset); | 273 | unsigned max_code = CHARSET_MAX_CODE (charset); |
| @@ -440,9 +436,7 @@ load_charset_map (charset, entries, n_entries, control_flag) | |||
| 440 | paying attention to comment charcter '#'. */ | 436 | paying attention to comment charcter '#'. */ |
| 441 | 437 | ||
| 442 | static INLINE unsigned | 438 | static INLINE unsigned |
| 443 | read_hex (fp, eof) | 439 | read_hex (FILE *fp, int *eof) |
| 444 | FILE *fp; | ||
| 445 | int *eof; | ||
| 446 | { | 440 | { |
| 447 | int c; | 441 | int c; |
| 448 | unsigned n; | 442 | unsigned n; |
| @@ -500,10 +494,7 @@ extern Lisp_Object Qfile_name_handler_alist; | |||
| 500 | extern void add_to_log (char *, Lisp_Object, Lisp_Object); | 494 | extern void add_to_log (char *, Lisp_Object, Lisp_Object); |
| 501 | 495 | ||
| 502 | static void | 496 | static void |
| 503 | load_charset_map_from_file (charset, mapfile, control_flag) | 497 | load_charset_map_from_file (struct charset *charset, Lisp_Object mapfile, int control_flag) |
| 504 | struct charset *charset; | ||
| 505 | Lisp_Object mapfile; | ||
| 506 | int control_flag; | ||
| 507 | { | 498 | { |
| 508 | unsigned min_code = CHARSET_MIN_CODE (charset); | 499 | unsigned min_code = CHARSET_MIN_CODE (charset); |
| 509 | unsigned max_code = CHARSET_MAX_CODE (charset); | 500 | unsigned max_code = CHARSET_MAX_CODE (charset); |
| @@ -573,10 +564,7 @@ load_charset_map_from_file (charset, mapfile, control_flag) | |||
| 573 | } | 564 | } |
| 574 | 565 | ||
| 575 | static void | 566 | static void |
| 576 | load_charset_map_from_vector (charset, vec, control_flag) | 567 | load_charset_map_from_vector (struct charset *charset, Lisp_Object vec, int control_flag) |
| 577 | struct charset *charset; | ||
| 578 | Lisp_Object vec; | ||
| 579 | int control_flag; | ||
| 580 | { | 568 | { |
| 581 | unsigned min_code = CHARSET_MIN_CODE (charset); | 569 | unsigned min_code = CHARSET_MIN_CODE (charset); |
| 582 | unsigned max_code = CHARSET_MAX_CODE (charset); | 570 | unsigned max_code = CHARSET_MAX_CODE (charset); |
| @@ -652,9 +640,7 @@ load_charset_map_from_vector (charset, vec, control_flag) | |||
| 652 | map it is (see the comment of load_charset_map for the detail). */ | 640 | map it is (see the comment of load_charset_map for the detail). */ |
| 653 | 641 | ||
| 654 | static void | 642 | static void |
| 655 | load_charset (charset, control_flag) | 643 | load_charset (struct charset *charset, int control_flag) |
| 656 | struct charset *charset; | ||
| 657 | int control_flag; | ||
| 658 | { | 644 | { |
| 659 | Lisp_Object map; | 645 | Lisp_Object map; |
| 660 | 646 | ||
| @@ -689,10 +675,7 @@ void map_charset_for_dump (void (*c_function) (Lisp_Object, Lisp_Object), | |||
| 689 | unsigned from, unsigned to); | 675 | unsigned from, unsigned to); |
| 690 | 676 | ||
| 691 | void | 677 | void |
| 692 | map_charset_for_dump (c_function, function, arg, from, to) | 678 | map_charset_for_dump (void (*c_function) (Lisp_Object, Lisp_Object), Lisp_Object function, Lisp_Object arg, unsigned int from, unsigned int to) |
| 693 | void (*c_function) (Lisp_Object, Lisp_Object); | ||
| 694 | Lisp_Object function, arg; | ||
| 695 | unsigned from, to; | ||
| 696 | { | 679 | { |
| 697 | int from_idx = CODE_POINT_TO_INDEX (temp_charset_work->current, from); | 680 | int from_idx = CODE_POINT_TO_INDEX (temp_charset_work->current, from); |
| 698 | int to_idx = CODE_POINT_TO_INDEX (temp_charset_work->current, to); | 681 | int to_idx = CODE_POINT_TO_INDEX (temp_charset_work->current, to); |
| @@ -1484,8 +1467,7 @@ return nil. */) | |||
| 1484 | } | 1467 | } |
| 1485 | 1468 | ||
| 1486 | static void | 1469 | static void |
| 1487 | check_iso_charset_parameter (dimension, chars, final_char) | 1470 | check_iso_charset_parameter (Lisp_Object dimension, Lisp_Object chars, Lisp_Object final_char) |
| 1488 | Lisp_Object dimension, chars, final_char; | ||
| 1489 | { | 1471 | { |
| 1490 | CHECK_NATNUM (dimension); | 1472 | CHECK_NATNUM (dimension); |
| 1491 | CHECK_NATNUM (chars); | 1473 | CHECK_NATNUM (chars); |
| @@ -1535,8 +1517,7 @@ if CHARSET is designated instead. */) | |||
| 1535 | */ | 1517 | */ |
| 1536 | 1518 | ||
| 1537 | int | 1519 | int |
| 1538 | string_xstring_p (string) | 1520 | string_xstring_p (Lisp_Object string) |
| 1539 | Lisp_Object string; | ||
| 1540 | { | 1521 | { |
| 1541 | const unsigned char *p = SDATA (string); | 1522 | const unsigned char *p = SDATA (string); |
| 1542 | const unsigned char *endp = p + SBYTES (string); | 1523 | const unsigned char *endp = p + SBYTES (string); |
| @@ -1563,11 +1544,7 @@ string_xstring_p (string) | |||
| 1563 | It may lookup a translation table TABLE if supplied. */ | 1544 | It may lookup a translation table TABLE if supplied. */ |
| 1564 | 1545 | ||
| 1565 | static void | 1546 | static void |
| 1566 | find_charsets_in_text (ptr, nchars, nbytes, charsets, table, multibyte) | 1547 | find_charsets_in_text (const unsigned char *ptr, EMACS_INT nchars, EMACS_INT nbytes, Lisp_Object charsets, Lisp_Object table, int multibyte) |
| 1567 | const unsigned char *ptr; | ||
| 1568 | EMACS_INT nchars, nbytes; | ||
| 1569 | Lisp_Object charsets, table; | ||
| 1570 | int multibyte; | ||
| 1571 | { | 1548 | { |
| 1572 | const unsigned char *pend = ptr + nbytes; | 1549 | const unsigned char *pend = ptr + nbytes; |
| 1573 | 1550 | ||
| @@ -1689,9 +1666,7 @@ only `ascii', `eight-bit-control', and `eight-bit-graphic'. */) | |||
| 1689 | value of Vchar_unify_table for C; i.e. it is nil, an integer, or a | 1666 | value of Vchar_unify_table for C; i.e. it is nil, an integer, or a |
| 1690 | charset symbol. */ | 1667 | charset symbol. */ |
| 1691 | int | 1668 | int |
| 1692 | maybe_unify_char (c, val) | 1669 | maybe_unify_char (int c, Lisp_Object val) |
| 1693 | int c; | ||
| 1694 | Lisp_Object val; | ||
| 1695 | { | 1670 | { |
| 1696 | struct charset *charset; | 1671 | struct charset *charset; |
| 1697 | 1672 | ||
| @@ -1724,9 +1699,7 @@ maybe_unify_char (c, val) | |||
| 1724 | CHARSET. */ | 1699 | CHARSET. */ |
| 1725 | 1700 | ||
| 1726 | int | 1701 | int |
| 1727 | decode_char (charset, code) | 1702 | decode_char (struct charset *charset, unsigned int code) |
| 1728 | struct charset *charset; | ||
| 1729 | unsigned code; | ||
| 1730 | { | 1703 | { |
| 1731 | int c, char_index; | 1704 | int c, char_index; |
| 1732 | enum charset_method method = CHARSET_METHOD (charset); | 1705 | enum charset_method method = CHARSET_METHOD (charset); |
| @@ -1805,9 +1778,7 @@ Lisp_Object charset_work; | |||
| 1805 | use CHARSET's strict_max_char instead of max_char. */ | 1778 | use CHARSET's strict_max_char instead of max_char. */ |
| 1806 | 1779 | ||
| 1807 | unsigned | 1780 | unsigned |
| 1808 | encode_char (charset, c) | 1781 | encode_char (struct charset *charset, int c) |
| 1809 | struct charset *charset; | ||
| 1810 | int c; | ||
| 1811 | { | 1782 | { |
| 1812 | unsigned code; | 1783 | unsigned code; |
| 1813 | enum charset_method method = CHARSET_METHOD (charset); | 1784 | enum charset_method method = CHARSET_METHOD (charset); |
| @@ -2057,10 +2028,7 @@ is specified. */) | |||
| 2057 | Vcharset_ordered_list. */ | 2028 | Vcharset_ordered_list. */ |
| 2058 | 2029 | ||
| 2059 | struct charset * | 2030 | struct charset * |
| 2060 | char_charset (c, charset_list, code_return) | 2031 | char_charset (int c, Lisp_Object charset_list, unsigned int *code_return) |
| 2061 | int c; | ||
| 2062 | Lisp_Object charset_list; | ||
| 2063 | unsigned *code_return; | ||
| 2064 | { | 2032 | { |
| 2065 | int maybe_null = 0; | 2033 | int maybe_null = 0; |
| 2066 | 2034 | ||
| @@ -2314,7 +2282,7 @@ Return charset identification number of CHARSET. */) | |||
| 2314 | 2282 | ||
| 2315 | 2283 | ||
| 2316 | void | 2284 | void |
| 2317 | init_charset () | 2285 | init_charset (void) |
| 2318 | { | 2286 | { |
| 2319 | Lisp_Object tempdir; | 2287 | Lisp_Object tempdir; |
| 2320 | tempdir = Fexpand_file_name (build_string ("charsets"), Vdata_directory); | 2288 | tempdir = Fexpand_file_name (build_string ("charsets"), Vdata_directory); |
| @@ -2332,7 +2300,7 @@ Please check your installation!\n", | |||
| 2332 | 2300 | ||
| 2333 | 2301 | ||
| 2334 | void | 2302 | void |
| 2335 | init_charset_once () | 2303 | init_charset_once (void) |
| 2336 | { | 2304 | { |
| 2337 | int i, j, k; | 2305 | int i, j, k; |
| 2338 | 2306 | ||
| @@ -2353,7 +2321,7 @@ init_charset_once () | |||
| 2353 | #ifdef emacs | 2321 | #ifdef emacs |
| 2354 | 2322 | ||
| 2355 | void | 2323 | void |
| 2356 | syms_of_charset () | 2324 | syms_of_charset (void) |
| 2357 | { | 2325 | { |
| 2358 | DEFSYM (Qcharsetp, "charsetp"); | 2326 | DEFSYM (Qcharsetp, "charsetp"); |
| 2359 | 2327 | ||