diff --git a/Objects/bytes_methods.c b/Objects/bytes_methods.c index d7f061bcf09..d5c4fe6346f 100644 --- a/Objects/bytes_methods.c +++ b/Objects/bytes_methods.c @@ -670,7 +670,7 @@ _Py_bytes_contains(const char *str, Py_ssize_t len, PyObject *arg) * against substr, using the start and end arguments. Returns * -1 on error, 0 if not found and 1 if found. */ -Py_LOCAL(int) +static int tailmatch(const char *str, Py_ssize_t len, PyObject *substr, Py_ssize_t start, Py_ssize_t end, int direction) { @@ -716,7 +716,7 @@ notfound: return 0; } -Py_LOCAL(PyObject *) +static PyObject * _Py_bytes_tailmatch(const char *str, Py_ssize_t len, const char *function_name, PyObject *args, int direction) diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index 6e7c4fa1886..4d14451254f 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -1500,7 +1500,7 @@ bytes_item(PyBytesObject *a, Py_ssize_t i) return PyLong_FromLong((unsigned char)a->ob_sval[i]); } -Py_LOCAL(int) +static int bytes_compare_eq(PyBytesObject *a, PyBytesObject *b) { int cmp; diff --git a/Objects/stringlib/transmogrify.h b/Objects/stringlib/transmogrify.h index 625507ddb1d..9903912dc4a 100644 --- a/Objects/stringlib/transmogrify.h +++ b/Objects/stringlib/transmogrify.h @@ -5,7 +5,7 @@ /* the more complicated methods. parts of these should be pulled out into the shared code in bytes_methods.c to cut down on duplicate code bloat. */ -Py_LOCAL_INLINE(PyObject *) +static inline PyObject * return_self(PyObject *self) { #if !STRINGLIB_MUTABLE @@ -90,7 +90,7 @@ stringlib_expandtabs(PyObject *self, PyObject *args, PyObject *kwds) return NULL; } -Py_LOCAL_INLINE(PyObject *) +static inline PyObject * pad(PyObject *self, Py_ssize_t left, Py_ssize_t right, char fill) { PyObject *u; @@ -212,7 +212,7 @@ stringlib_zfill(PyObject *self, PyObject *args) ((char *)memchr((const void *)(target), c, target_len)) -Py_LOCAL_INLINE(Py_ssize_t) +static Py_ssize_t countchar(const char *target, Py_ssize_t target_len, char c, Py_ssize_t maxcount) { @@ -233,7 +233,7 @@ countchar(const char *target, Py_ssize_t target_len, char c, /* Algorithms for different cases of string replacement */ /* len(self)>=1, from="", len(to)>=1, maxcount>=1 */ -Py_LOCAL(PyObject *) +static PyObject * stringlib_replace_interleave(PyObject *self, const char *to_s, Py_ssize_t to_len, Py_ssize_t maxcount) @@ -304,7 +304,7 @@ stringlib_replace_interleave(PyObject *self, /* Special case for deleting a single character */ /* len(self)>=1, len(from)==1, to="", maxcount>=1 */ -Py_LOCAL(PyObject *) +static PyObject * stringlib_replace_delete_single_character(PyObject *self, char from_c, Py_ssize_t maxcount) { @@ -348,7 +348,7 @@ stringlib_replace_delete_single_character(PyObject *self, /* len(self)>=1, len(from)>=2, to="", maxcount>=1 */ -Py_LOCAL(PyObject *) +static PyObject * stringlib_replace_delete_substring(PyObject *self, const char *from_s, Py_ssize_t from_len, Py_ssize_t maxcount) @@ -400,7 +400,7 @@ stringlib_replace_delete_substring(PyObject *self, } /* len(self)>=1, len(from)==len(to)==1, maxcount>=1 */ -Py_LOCAL(PyObject *) +static PyObject * stringlib_replace_single_character_in_place(PyObject *self, char from_c, char to_c, Py_ssize_t maxcount) @@ -447,7 +447,7 @@ stringlib_replace_single_character_in_place(PyObject *self, } /* len(self)>=1, len(from)==len(to)>=2, maxcount>=1 */ -Py_LOCAL(PyObject *) +static PyObject * stringlib_replace_substring_in_place(PyObject *self, const char *from_s, Py_ssize_t from_len, const char *to_s, Py_ssize_t to_len, @@ -499,7 +499,7 @@ stringlib_replace_substring_in_place(PyObject *self, } /* len(self)>=1, len(from)==1, len(to)>=2, maxcount>=1 */ -Py_LOCAL(PyObject *) +static PyObject * stringlib_replace_single_character(PyObject *self, char from_c, const char *to_s, Py_ssize_t to_len, @@ -563,7 +563,7 @@ stringlib_replace_single_character(PyObject *self, } /* len(self)>=1, len(from)>=2, len(to)>=2, maxcount>=1 */ -Py_LOCAL(PyObject *) +static PyObject * stringlib_replace_substring(PyObject *self, const char *from_s, Py_ssize_t from_len, const char *to_s, Py_ssize_t to_len, @@ -632,7 +632,7 @@ stringlib_replace_substring(PyObject *self, } -Py_LOCAL(PyObject *) +static PyObject * stringlib_replace(PyObject *self, const char *from_s, Py_ssize_t from_len, const char *to_s, Py_ssize_t to_len, diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index e0c3bfecdd8..aaebfd017fa 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -10936,7 +10936,7 @@ unicode_compare(PyObject *str1, PyObject *str2) #undef COMPARE } -Py_LOCAL(int) +static int unicode_compare_eq(PyObject *str1, PyObject *str2) { int kind;