diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 2017-01-01 02:03:07 -0500 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 2017-01-01 02:03:07 -0500 |
| commit | 41f27b48c592dee7d229c81b5899107b5399b1bc (patch) | |
| tree | 5344eb583ea94abb8a6f731e38a649f46afa0df7 /src | |
| parent | ac3144a9cb2351a389a740159468698886eeb7f3 (diff) | |
| download | lynx-snapshots-41f27b48c592dee7d229c81b5899107b5399b1bc.tar.gz | |
snapshot of project "lynx", label v2-8-9dev_11h
Diffstat (limited to 'src')
| -rw-r--r-- | src/GridText.c | 16 | ||||
| -rw-r--r-- | src/LYOptions.c | 4 | ||||
| -rw-r--r-- | src/LYOptions.h | 6 |
3 files changed, 14 insertions, 12 deletions
diff --git a/src/GridText.c b/src/GridText.c index a2f5479a..35bd80e7 100644 --- a/src/GridText.c +++ b/src/GridText.c @@ -1,5 +1,5 @@ /* - * $LynxId: GridText.c,v 1.290 2016/11/24 18:10:02 tom Exp $ + * $LynxId: GridText.c,v 1.291 2017/01/01 00:56:20 Takeshi.Hataguchi Exp $ * * Character grid hypertext object * =============================== @@ -4444,14 +4444,12 @@ void HText_appendCharacter(HText *text, int ch) case SJIS: if ((text->kcode == EUC) || (text->kcode == JIS)) { - if (!conv_jisx0201kana && IS_EUC_X0201KANA(hi, lo)) { - if (IS_EUC_X0201KANA(hi, lo)) { - line->data[line->size++] = (char) lo; - } else { - EUC_TO_SJIS1(hi, lo, tmp); - line->data[line->size++] = (char) tmp[0]; - line->data[line->size++] = (char) tmp[1]; - } + if (!conv_jisx0201kana && IS_EUC_X0201KANA(hi, lo)) + line->data[line->size++] = lo; + else { + EUC_TO_SJIS1(hi, lo, tmp); + line->data[line->size++] = (char) tmp[0]; + line->data[line->size++] = (char) tmp[1]; } } else if (IS_SJIS_2BYTE(hi, lo)) { line->data[line->size++] = (char) hi; diff --git a/src/LYOptions.c b/src/LYOptions.c index 4c6b98dd..8e795c51 100644 --- a/src/LYOptions.c +++ b/src/LYOptions.c @@ -1,4 +1,4 @@ -/* $LynxId: LYOptions.c,v 1.170 2016/11/24 18:30:48 tom Exp $ */ +/* $LynxId: LYOptions.c,v 1.171 2017/01/01 01:49:49 tom Exp $ */ #include <HTUtils.h> #include <HTFTP.h> #include <HTTP.h> /* 'reloading' flag */ @@ -2513,7 +2513,7 @@ static BOOLEAN GetOptValues(OptValues * table, char *value, #ifdef USE_COLOR_STYLE #ifdef LY_FIND_LEAKS -static void free_colorstyle_leaks(void) +void free_colorstyle_leaks(void) { FREE(color_style_values); } diff --git a/src/LYOptions.h b/src/LYOptions.h index 0c5f5f2a..2811f2ad 100644 --- a/src/LYOptions.h +++ b/src/LYOptions.h @@ -1,4 +1,4 @@ -/* $LynxId: LYOptions.h,v 1.31 2013/10/22 00:37:32 tom Exp $ */ +/* $LynxId: LYOptions.h,v 1.32 2017/01/01 01:51:23 tom Exp $ */ #ifndef LYOPTIONS_H #define LYOPTIONS_H @@ -36,6 +36,10 @@ extern "C" { extern void build_lss_enum(HTList *); #endif +#if defined(USE_COLOR_STYLE) && defined(LY_FIND_LEAKS) + extern void free_colorstyle_leaks(void); +#endif + #ifdef __cplusplus } #endif |