summaryrefslogtreecommitdiff
path: root/Objects/unicodeobject.c
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2017-09-12 16:09:44 -0700
committerGitHub <noreply@github.com>2017-09-12 16:09:44 -0700
commitc0e77364ca29df6cfb311e79892955c92bd8e595 (patch)
tree17f4a3d23ff42877420078441f2534d427fb21c0 /Objects/unicodeobject.c
parent5013a5ebc9978a58435036fa3860c465882c21da (diff)
downloadcpython-git-c0e77364ca29df6cfb311e79892955c92bd8e595.tar.gz
[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/unicodeobject.c')
-rw-r--r--Objects/unicodeobject.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 1f221aff67..e9fc658038 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,