mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-22 13:40:44 -08:00
Code Issues Projects Releases Wiki Activity

(decode_coding_charset): Fix previous change.

Browse source
This commit is contained in:
Kenichi Handa 2002-05-22 11:30:00 +00:00
parent c7c66a958b
commit acb2a96517
1 changed files with 8 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/coding.c
View file

@ -4336,8 +4336,8 @@ decode_coding_charset (coding)
Lisp_Object val; Lisp_Object val;
struct charset *charset; struct charset *charset;
int dim; int dim;
unsigned code; int len = 1;
int c1; unsigned code = c;
val = AREF (valids, c); val = AREF (valids, c);
if (NILP (val)) if (NILP (val))
@ -4346,21 +4346,10 @@ decode_coding_charset (coding)
{ {
charset = CHARSET_FROM_ID (XFASTINT (val)); charset = CHARSET_FROM_ID (XFASTINT (val));
dim = CHARSET_DIMENSION (charset); dim = CHARSET_DIMENSION (charset);
code = c; while (len++ < dim)
if (dim > 1)
{ {
ONE_MORE_BYTE (c1); ONE_MORE_BYTE (c);
code = (code << 8) | c1; code = (code << 8) | c;
if (dim > 2)
{
ONE_MORE_BYTE (c1);
code = (code << 8) | c1;
if (dim > 3)
{
ONE_MORE_BYTE (c1);
code = (c << 8) | c1;
}
}
} }
CODING_DECODE_CHAR (coding, src, src_base, src_end, CODING_DECODE_CHAR (coding, src, src_base, src_end,
charset, code, c); charset, code, c);
@ -4370,28 +4359,15 @@ decode_coding_charset (coding)
/* VAL is a list of charset IDs. It is assured that the /* VAL is a list of charset IDs. It is assured that the
list is sorted by charset dimensions (smaller one list is sorted by charset dimensions (smaller one
comes first). */ comes first). */
int b[4];
int len = 1;
b[0] = c;
/* VAL is a list of charset IDs. */
while (CONSP (val)) while (CONSP (val))
{ {
charset = CHARSET_FROM_ID (XFASTINT (XCAR (val))); charset = CHARSET_FROM_ID (XFASTINT (XCAR (val)));
dim = CHARSET_DIMENSION (charset); dim = CHARSET_DIMENSION (charset);
while (len < dim) while (len++ < dim)
{ {
ONE_MORE_BYTE (c1); ONE_MORE_BYTE (c);
b[len++] = c1; code = (code << 8) | c;
} }
if (dim == 1)
code = b[0];
else if (dim == 2)
code = (b[0] << 8) | b[1];
else if (dim == 3)
code = (b[0] << 16) | (b[1] << 8) | b[2];
else
code = (b[0] << 24) | (b[1] << 16) | (b[2] << 8) | b[3];
CODING_DECODE_CHAR (coding, src, src_base, CODING_DECODE_CHAR (coding, src, src_base,
src_end, charset, code, c); src_end, charset, code, c);
if (c >= 0) if (c >= 0)