Mercurial > emacs
changeset 49915:95557d4395b0
(string_to_multibyte): Remove unused var i.
(Flanginfo): Fix int/Lisp_Object mixup.
(void_call2): New fun.
(Fmap_char_table): Use it in place of call2.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sat, 22 Feb 2003 22:21:11 +0000 |
| parents | b4b6ede28a6f |
| children | 53e4bfb7a480 |
| files | src/fns.c |
| diffstat | 1 files changed, 15 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/fns.c Sat Feb 22 22:20:00 2003 +0000 +++ b/src/fns.c Sat Feb 22 22:21:11 2003 +0000 @@ -1047,7 +1047,6 @@ { unsigned char *buf; int nbytes; - int i; if (STRING_MULTIBYTE (string)) return string; @@ -2699,6 +2698,14 @@ } } +static void void_call2 P_ ((Lisp_Object a, Lisp_Object b, Lisp_Object c)); +static void +void_call2 (a, b, c) + Lisp_Object a, b, c; +{ + call2 (a, b, c); +} + DEFUN ("map-char-table", Fmap_char_table, Smap_char_table, 2, 2, 0, doc: /* Call FUNCTION for each (normal and generic) characters in CHAR-TABLE. @@ -2712,7 +2719,11 @@ CHECK_CHAR_TABLE (char_table); - map_char_table ((POINTER_TYPE *) call2, Qnil, char_table, function, 0, indices); + /* When Lisp_Object is represented as a union, `call2' cannot directly + be passed to map_char_table because it returns a Lisp_Object rather + than returning nothing. + Casting leads to crashes on some architectures. -stef */ + map_char_table (void_call2, Qnil, char_table, function, 0, indices); return Qnil; } @@ -3490,7 +3501,7 @@ it is consistent with CODESET? If not, what to do? */ Faset (v, make_number (i), code_convert_string_norecord (val, Vlocale_coding_system, - Qnil)); + 0)); } return v; } @@ -3508,7 +3519,7 @@ str = nl_langinfo (months[i]); val = make_unibyte_string (str, strlen (str)); p->contents[i] = - code_convert_string_norecord (val, Vlocale_coding_system, Qnil); + code_convert_string_norecord (val, Vlocale_coding_system, 0); } XSETVECTOR (val, p); return val;