From 27ee0f8551a6d576a65e20da90acf9f3cb412c35 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Fri, 17 May 2019 23:46:22 +0000 Subject: Fix couple of dead code paths (GH-7418) --- Objects/bytesobject.c | 2 -- Objects/stringlib/fastsearch.h | 1 - Python/ast.c | 3 --- Python/compile.c | 1 - 4 files changed, 7 deletions(-) diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index ebbdb7c..41453b2 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -1617,12 +1617,10 @@ bytes_richcompare(PyBytesObject *a, PyBytesObject *b, int op) case Py_GE: /* a string is equal to itself */ Py_RETURN_TRUE; - break; case Py_NE: case Py_LT: case Py_GT: Py_RETURN_FALSE; - break; default: PyErr_BadArgument(); return NULL; diff --git a/Objects/stringlib/fastsearch.h b/Objects/stringlib/fastsearch.h index a8a51d5..46fcf35 100644 --- a/Objects/stringlib/fastsearch.h +++ b/Objects/stringlib/fastsearch.h @@ -192,7 +192,6 @@ FASTSEARCH(const STRINGLIB_CHAR* s, Py_ssize_t n, } return count; } - return -1; } mlast = m - 1; diff --git a/Python/ast.c b/Python/ast.c index 03da4e7..abc8d89 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -2971,7 +2971,6 @@ ast_for_expr(struct compiling *c, const node *n) return Compare(expression, ops, cmps, LINENO(n), n->n_col_offset, n->n_end_lineno, n->n_end_col_offset, c->c_arena); } - break; case star_expr: return ast_for_starred(c, n); @@ -3618,7 +3617,6 @@ alias_for_import_name(struct compiling *c, const node *n, int store) return NULL; return a; } - break; case dotted_name: if (NCH(n) == 1) { node *name_node = CHILD(n, 0); @@ -3669,7 +3667,6 @@ alias_for_import_name(struct compiling *c, const node *n, int store) } return alias(str, NULL, c->c_arena); } - break; case STAR: str = PyUnicode_InternFromString("*"); if (!str) diff --git a/Python/compile.c b/Python/compile.c index 2a086a5..b20548c 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -4868,7 +4868,6 @@ compiler_visit_expr1(struct compiler *c, expr_ty e) return compiler_error(c, "can't use starred expression here"); } - break; case Name_kind: return compiler_nameop(c, e->v.Name.id, e->v.Name.ctx); /* child nodes of List and Tuple will have expr_context set */ -- cgit v0.12