diff options
| author | R David Murray <rdmurray@bitdance.com> | 2012-04-13 21:27:19 -0400 |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2012-04-13 21:27:19 -0400 |
| commit | ea7bc055b08fb442986e0735b1b5b325b0b51ecc (patch) | |
| tree | 20c2b837c787daf7e95ece075e6544627b17625a /Objects/stringlib/partition.h | |
| parent | c32365d2ce552d1d17279e30a564509235ffb1db (diff) | |
| parent | c2c9c905706160bf34aea12f2348210aac3e0da2 (diff) | |
| download | cpython-ea7bc055b08fb442986e0735b1b5b325b0b51ecc.tar.gz | |
Merge #14399: corrected news item
Diffstat (limited to 'Objects/stringlib/partition.h')
| -rw-r--r-- | Objects/stringlib/partition.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Objects/stringlib/partition.h b/Objects/stringlib/partition.h index 0170bddbf0..40cb5129d5 100644 --- a/Objects/stringlib/partition.h +++ b/Objects/stringlib/partition.h @@ -1,14 +1,11 @@ /* stringlib: partition implementation */ -#ifndef STRINGLIB_PARTITION_H -#define STRINGLIB_PARTITION_H - #ifndef STRINGLIB_FASTSEARCH_H #error must include "stringlib/fastsearch.h" before including this module #endif Py_LOCAL_INLINE(PyObject*) -stringlib_partition(PyObject* str_obj, +STRINGLIB(partition)(PyObject* str_obj, const STRINGLIB_CHAR* str, Py_ssize_t str_len, PyObject* sep_obj, const STRINGLIB_CHAR* sep, Py_ssize_t sep_len) @@ -25,7 +22,7 @@ stringlib_partition(PyObject* str_obj, if (!out) return NULL; - pos = fastsearch(str, str_len, sep, sep_len, -1, FAST_SEARCH); + pos = FASTSEARCH(str, str_len, sep, sep_len, -1, FAST_SEARCH); if (pos < 0) { #if STRINGLIB_MUTABLE @@ -58,7 +55,7 @@ stringlib_partition(PyObject* str_obj, } Py_LOCAL_INLINE(PyObject*) -stringlib_rpartition(PyObject* str_obj, +STRINGLIB(rpartition)(PyObject* str_obj, const STRINGLIB_CHAR* str, Py_ssize_t str_len, PyObject* sep_obj, const STRINGLIB_CHAR* sep, Py_ssize_t sep_len) @@ -75,7 +72,7 @@ stringlib_rpartition(PyObject* str_obj, if (!out) return NULL; - pos = fastsearch(str, str_len, sep, sep_len, -1, FAST_RSEARCH); + pos = FASTSEARCH(str, str_len, sep, sep_len, -1, FAST_RSEARCH); if (pos < 0) { #if STRINGLIB_MUTABLE @@ -107,4 +104,3 @@ stringlib_rpartition(PyObject* str_obj, return out; } -#endif |