diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2010-06-09 16:38:55 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-06-09 16:38:55 (GMT) |
commit | d118856049e514dd413112ee6e2d03713c68df9d (patch) | |
tree | 6afc87270a947d160c349905a0cc85de247ab71b /Objects/bytearrayobject.c | |
parent | 0ca4624e8a3328bb53a78d12fd596dfc98eabf89 (diff) | |
download | cpython-d118856049e514dd413112ee6e2d03713c68df9d.zip cpython-d118856049e514dd413112ee6e2d03713c68df9d.tar.gz cpython-d118856049e514dd413112ee6e2d03713c68df9d.tar.bz2 |
Merged revisions 81860 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81860 | antoine.pitrou | 2010-06-09 18:24:00 +0200 (mer., 09 juin 2010) | 3 lines
Issue #8930: fix some C code indentation
........
Diffstat (limited to 'Objects/bytearrayobject.c')
-rw-r--r-- | Objects/bytearrayobject.c | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c index 165ccae..16350ff 100644 --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -1650,43 +1650,43 @@ replace_single_character_in_place(PyByteArrayObject *self, char from_c, char to_c, Py_ssize_t maxcount) { - char *self_s, *result_s, *start, *end, *next; - Py_ssize_t self_len; - PyByteArrayObject *result; + char *self_s, *result_s, *start, *end, *next; + Py_ssize_t self_len; + PyByteArrayObject *result; - /* The result string will be the same size */ - self_s = PyByteArray_AS_STRING(self); - self_len = PyByteArray_GET_SIZE(self); + /* The result string will be the same size */ + self_s = PyByteArray_AS_STRING(self); + self_len = PyByteArray_GET_SIZE(self); - next = findchar(self_s, self_len, from_c); + next = findchar(self_s, self_len, from_c); - if (next == NULL) { - /* No matches; return the original bytes */ - return return_self(self); - } + if (next == NULL) { + /* No matches; return the original bytes */ + return return_self(self); + } - /* Need to make a new bytes */ - result = (PyByteArrayObject *) PyByteArray_FromStringAndSize(NULL, self_len); - if (result == NULL) - return NULL; - result_s = PyByteArray_AS_STRING(result); - Py_MEMCPY(result_s, self_s, self_len); - - /* change everything in-place, starting with this one */ - start = result_s + (next-self_s); - *start = to_c; - start++; - end = result_s + self_len; - - while (--maxcount > 0) { - next = findchar(start, end-start, from_c); - if (next == NULL) - break; - *next = to_c; - start = next+1; - } + /* Need to make a new bytes */ + result = (PyByteArrayObject *) PyByteArray_FromStringAndSize(NULL, self_len); + if (result == NULL) + return NULL; + result_s = PyByteArray_AS_STRING(result); + Py_MEMCPY(result_s, self_s, self_len); + + /* change everything in-place, starting with this one */ + start = result_s + (next-self_s); + *start = to_c; + start++; + end = result_s + self_len; + + while (--maxcount > 0) { + next = findchar(start, end-start, from_c); + if (next == NULL) + break; + *next = to_c; + start = next+1; + } - return result; + return result; } /* len(self)>=1, len(from)==len(to)>=2, maxcount>=1 */ |