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 /Objects | |
| 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 'Objects')
| -rw-r--r-- | Objects/stringlib/codecs.h | 4 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Objects/stringlib/codecs.h b/Objects/stringlib/codecs.h index 43f2f32..f019d9a 100644 --- a/Objects/stringlib/codecs.h +++ b/Objects/stringlib/codecs.h @@ -330,7 +330,7 @@ STRINGLIB(utf8_encoder)(PyObject *unicode, case _Py_ERROR_REPLACE: memset(p, '?', endpos - startpos); p += (endpos - startpos); - /* fall through the ignore handler */ + /* fall through */ case _Py_ERROR_IGNORE: i += (endpos - startpos - 1); break; @@ -378,7 +378,7 @@ STRINGLIB(utf8_encoder)(PyObject *unicode, } startpos = k; assert(startpos < endpos); - /* fall through the default handler */ + /* fall through */ default: rep = unicode_encode_call_errorhandler( errors, &error_handler_obj, "utf-8", "surrogates not allowed", diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 1f221af..e9fc658 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -1779,6 +1779,7 @@ unicode_dealloc(PyObject *unicode) case SSTATE_INTERNED_IMMORTAL: Py_FatalError("Immortal interned string died."); + /* fall through */ default: Py_FatalError("Inconsistent interned string state."); @@ -6816,7 +6817,7 @@ unicode_encode_ucs1(PyObject *unicode, case _Py_ERROR_REPLACE: memset(str, '?', collend - collstart); str += (collend - collstart); - /* fall through ignore error handler */ + /* fall through */ case _Py_ERROR_IGNORE: pos = collend; break; @@ -6855,7 +6856,7 @@ unicode_encode_ucs1(PyObject *unicode, break; collstart = pos; assert(collstart != collend); - /* fallback to general error handling */ + /* fall through */ default: rep = unicode_encode_call_errorhandler(errors, &error_handler_obj, |