diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-09-12 23:09:44 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-12 23:09:44 (GMT) |
| commit | c0e77364ca29df6cfb311e79892955c92bd8e595 (patch) | |
| tree | 17f4a3d23ff42877420078441f2534d427fb21c0 /Modules/cjkcodecs | |
| parent | 5013a5ebc9978a58435036fa3860c465882c21da (diff) | |
| download | cpython-c0e77364ca29df6cfb311e79892955c92bd8e595.zip cpython-c0e77364ca29df6cfb311e79892955c92bd8e595.tar.gz cpython-c0e77364ca29df6cfb311e79892955c92bd8e595.tar.bz2 | |
[3.6] bpo-30923: Silence fall-through warnings included in -Wextra since gcc-7.0 (#3518)
* bpo-30923: Disable warning that has been part of -Wextra since gcc-7.0. (#3142)
(cherry picked from commit d73a960c575207539c3f9765cff26d4fff400b45)
* bpo-30923: Silence fall-through warnings included in -Wextra since gcc-7.0. (#3157)
(cherry picked from commit f432a3234f9f2ee09bd40be03e06bf72865ee375)
* bpo-31275: Small refactoring to silence a fall-through warning. (#3206)
(cherry picked from commit 138753c1b96b5e06a5c5d409fa4cae5e2fe1108b)
Diffstat (limited to 'Modules/cjkcodecs')
| -rw-r--r-- | Modules/cjkcodecs/_codecs_iso2022.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Modules/cjkcodecs/_codecs_iso2022.c b/Modules/cjkcodecs/_codecs_iso2022.c index 1ce4218..7394cf6 100644 --- a/Modules/cjkcodecs/_codecs_iso2022.c +++ b/Modules/cjkcodecs/_codecs_iso2022.c @@ -807,15 +807,9 @@ jisx0213_encoder(const Py_UCS4 *data, Py_ssize_t *length, void *config) case 2: /* second character of unicode pair */ coded = find_pairencmap((ucs2_t)data[0], (ucs2_t)data[1], jisx0213_pair_encmap, JISX0213_ENCPAIRS); - if (coded == DBCINV) { - *length = 1; - coded = find_pairencmap((ucs2_t)data[0], 0, - jisx0213_pair_encmap, JISX0213_ENCPAIRS); - if (coded == DBCINV) - return MAP_UNMAPPABLE; - } - else + if (coded != DBCINV) return coded; + /* fall through */ case -1: /* flush unterminated */ *length = 1; |