diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 2009-01-19 00:24:22 -0500 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 2009-01-19 00:24:22 -0500 |
| commit | 48ff48d73a95cad532210a23de3f9bcfbe42b6ec (patch) | |
| tree | a928f5e4f9dbe62ed59093cabbcf6b4ad60cf4aa /src | |
| parent | 97cbb26ac61781231fdb61c9f59aaecd1583f9f4 (diff) | |
| download | lynx-snapshots-48ff48d73a95cad532210a23de3f9bcfbe42b6ec.tar.gz | |
snapshot of project "lynx", label v2-8-7dev_12c
Diffstat (limited to 'src')
| -rw-r--r-- | src/UCdomap.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/UCdomap.c b/src/UCdomap.c index 33a6a6b4..48e91264 100644 --- a/src/UCdomap.c +++ b/src/UCdomap.c @@ -1,5 +1,5 @@ /* - * $LynxId: UCdomap.c,v 1.73 2009/01/01 22:10:53 tom Exp $ + * $LynxId: UCdomap.c,v 1.75 2009/01/18 23:19:37 tom Exp $ * * UCdomap.c * ========= @@ -842,7 +842,7 @@ int UCTransUniChar(long unicode, if ((UChndl_out = LYCharSet_UC[charset_out].UChndl) < 0) { if (LYCharSet_UC[charset_out].codepage < 0) { - if (unicode < 128 || charset_out == UTF8_handle) { + if (unicode < 128) { rc = (int) unicode; } else { rc = LYCharSet_UC[charset_out].codepage; @@ -1444,18 +1444,18 @@ int UCTransCharStr(char *outbuf, if (rc >= 0) return (int) strlen(outbuf); } - if (rc == -4) { + if (rc == ucNotFound) { if (!isdefault) rc = conv_uni_to_str(outbuf, buflen, 0xfffd, 0); - if ((rc == -4) && (isdefault || trydefault)) + if ((rc == ucNotFound) && (isdefault || trydefault)) rc = conv_uni_to_str(outbuf, buflen, 0xfffd, 1); if (rc >= 0) return (int) strlen(outbuf); } - if (chk_single_flag && src == -4) { + if (chk_single_flag && src == ucNotFound) { if (!isdefault) rc = conv_uni_to_pc(0xfffd, 0); - if ((rc == -4) && (isdefault || trydefault)) + if ((rc == ucNotFound) && (isdefault || trydefault)) rc = conv_uni_to_pc(0xfffd, 1); if (rc >= 32) { outbuf[0] = (char) rc; |