procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* coding.c (MIN_CHARBUF_SIZE): Delete it.

Browse source 
(MAX_CHARBUF_EXTRA_SIZE): New macro.
(ALLOC_CONVERSION_WORK_AREA): Use MAX_CHARBUF_EXTRA_SIZE.
This commit is contained in:
Kenichi Handa 2014-07-02 00:31:59 +09:00
parent 7ac67e08e5
commit 0782685d43
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/coding.c
View file

@ -7266,13 +7266,17 @@ produce_charset (struct coding_system *coding, int *charbuf, ptrdiff_t pos)
}
#define MAX_CHARBUF_SIZE 0x4000
#define MIN_CHARBUF_SIZE 0x10
/* How many units decoding functions expect in coding->charbuf at
most. Currently, decode_coding_emacs_mule expects the following
size, and that is the largest value. */
#define MAX_CHARBUF_EXTRA_SIZE ((MAX_ANNOTATION_LENGTH * 3) + 1)
#define ALLOC_CONVERSION_WORK_AREA(coding, size) \
do { \
int units = ((size) > MAX_CHARBUF_SIZE ? MAX_CHARBUF_SIZE \
: (size) < MIN_CHARBUF_SIZE ? MIN_CHARBUF_SIZE \
: size); \
int units = (size) + MAX_CHARBUF_EXTRA_SIZE; \
\
if (units > MAX_CHARBUF_SIZE) \
units = MAX_CHARBUF_SIZE; \
coding->charbuf = SAFE_ALLOCA ((units) * sizeof (int)); \
coding->charbuf_size = (units); \
} while (0)