From 8e6675a7dcaa71b1d8b5e094ea15bc21d13376f0 Mon Sep 17 00:00:00 2001 From: Neal Norwitz Date: Sun, 11 Jun 2006 05:47:14 +0000 Subject: [PATCH] Update doc to make it agree with code. Bottom factor out some common code. --- Objects/stringobject.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Objects/stringobject.c b/Objects/stringobject.c index a5c8cc28701..92477eea0c7 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -3099,7 +3099,7 @@ string_replace(PyStringObject *self, PyObject *args) /** End DALKE **/ -/* Matches the end (direction > 0) or start (direction < 0) of self +/* Matches the end (direction >= 0) or start (direction < 0) of self * against substr, using the start and end arguments. Returns * -1 on error, 0 if not found and 1 if found. */ @@ -3131,11 +3131,6 @@ _string_tailmatch(PyStringObject *self, PyObject *substr, Py_ssize_t start, /* startswith */ if (start+slen > len) return 0; - - if (end-start >= slen) - return ! memcmp(str+start, sub, slen); - else - return 0; } else { /* endswith */ if (end-start < slen || start > len) @@ -3143,11 +3138,10 @@ _string_tailmatch(PyStringObject *self, PyObject *substr, Py_ssize_t start, if (end-slen > start) start = end - slen; - if (end-start >= slen) - return ! memcmp(str+start, sub, slen); - else - return 0; } + if (end-start >= slen) + return ! memcmp(str+start, sub, slen); + return 0; }