diff options
| author | Stefan Krah <skrah@bytereef.org> | 2017-08-21 11:09:59 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-21 11:09:59 (GMT) |
| commit | f432a3234f9f2ee09bd40be03e06bf72865ee375 (patch) | |
| tree | c3efacc3e10d4bb12216be2eafae64f144ecfb5e /Objects | |
| parent | 0267128aa4dc7c383c341c19833c5d506eae9c93 (diff) | |
| download | cpython-f432a3234f9f2ee09bd40be03e06bf72865ee375.zip cpython-f432a3234f9f2ee09bd40be03e06bf72865ee375.tar.gz cpython-f432a3234f9f2ee09bd40be03e06bf72865ee375.tar.bz2 | |
bpo-30923: Silence fall-through warnings included in -Wextra since gcc-7.0. (#3157)
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/call.c | 4 | ||||
| -rw-r--r-- | Objects/stringlib/codecs.h | 4 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/Objects/call.c b/Objects/call.c index 3b08cb2..4294a9b 100644 --- a/Objects/call.c +++ b/Objects/call.c @@ -499,7 +499,7 @@ _PyMethodDef_RawFastCallDict(PyMethodDef *method, PyObject *self, PyObject **arg if (kwargs != NULL && PyDict_GET_SIZE(kwargs) != 0) { goto no_keyword_error; } - /* fall through next case */ + /* fall through */ case METH_VARARGS | METH_KEYWORDS: { @@ -656,7 +656,7 @@ _PyMethodDef_RawFastCallKeywords(PyMethodDef *method, PyObject *self, PyObject * if (nkwargs) { goto no_keyword_error; } - /* fall through next case */ + /* fall through */ case METH_VARARGS | METH_KEYWORDS: { 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 0e6cb7f..f7b2aa6 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -1794,6 +1794,7 @@ unicode_dealloc(PyObject *unicode) case SSTATE_INTERNED_IMMORTAL: Py_FatalError("Immortal interned string died."); + /* fall through */ default: Py_FatalError("Inconsistent interned string state."); @@ -6778,7 +6779,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; @@ -6817,7 +6818,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, |