diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2010-09-23 08:09:12 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2010-09-23 08:09:12 -0400 |
| commit | 141624691330c7622d9a31d53ec919dee8e97473 (patch) | |
| tree | c8f2a43e69346342552c6a72a307555ae26a739f /src/character.h | |
| parent | 7228f056909af1ffe9d8f611b959638bc9544d2f (diff) | |
| download | emacs-141624691330c7622d9a31d53ec919dee8e97473.tar.gz | |
Fix some more uses of int instead of EMACS_INT.
font.c (font_intern_prop): Use EMACS_INT for string length
variables.
character.c (parse_str_as_multibyte, str_as_multibyte)
(parse_str_to_multibyte, str_to_multibyte, str_as_unibyte)
(string_count_byte8, string_escape_byte8): Use EMACS_INT for
string length arguments, variables, and return values.
character.h (parse_str_as_multibyte, str_as_multibyte)
(parse_str_to_multibyte, str_to_multibyte, str_as_unibyte): Adjust
prototypes.
fns.c (Fstring_as_multibyte): Use EMACS_INT for string length
variables.
alloc.c <total_string_size>: Declare as EMACS_INT, not int.
(Fmake_string): Protect against too large strings.
(live_string_p, live_cons_p, live_symbol_p, live_float_p)
(live_misc_p): Use ptrdiff_t instead of int for pointer
differences.
(string_bytes, check_sblock, check_string_free_list)
(allocate_string_data, compact_small_strings, Fmake_string)
(Fmake_bool_vector, make_string, make_unibyte_string)
(make_multibyte_string, make_string_from_bytes)
(make_specified_string_string, Fmake_list, Fmake_vector): Use
EMACS_INT for string length variables and arguments.
(find_string_data_in_pure, make_pure_string, make_pure_c_string)
(Fpurecopy): Use EMACS_INT for string size.
(mark_vectorlike, mark_char_table, mark_object): Use EMACS_UINT
for vector size.
lisp.h (make_string, make_unibyte_string, make_multibyte_string)
(make_string_from_bytes, make_specified_string_string)
(make_pure_string, string_bytes): Adjust prototypes.
Diffstat (limited to 'src/character.h')
| -rw-r--r-- | src/character.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/character.h b/src/character.h index 8726b2ae1d6..cbc4d6b3121 100644 --- a/src/character.h +++ b/src/character.h @@ -603,12 +603,13 @@ extern int string_char (const unsigned char *, extern int translate_char (Lisp_Object, int c); extern int char_printable_p (int c); -extern void parse_str_as_multibyte (const unsigned char *, int, int *, - int *); -extern int parse_str_to_multibyte (const unsigned char *, int); -extern int str_as_multibyte (unsigned char *, int, int, int *); -extern int str_to_multibyte (unsigned char *, int, int); -extern int str_as_unibyte (unsigned char *, int); +extern void parse_str_as_multibyte (const unsigned char *, + EMACS_INT, EMACS_INT *, EMACS_INT *); +extern EMACS_INT parse_str_to_multibyte (const unsigned char *, EMACS_INT); +extern EMACS_INT str_as_multibyte (unsigned char *, EMACS_INT, EMACS_INT, + EMACS_INT *); +extern EMACS_INT str_to_multibyte (unsigned char *, EMACS_INT, EMACS_INT); +extern EMACS_INT str_as_unibyte (unsigned char *, EMACS_INT); extern EMACS_INT str_to_unibyte (const unsigned char *, unsigned char *, EMACS_INT, int); extern int strwidth (const unsigned char *, int); |