Skip to content

Commit 0313087

Browse files
committed
Make PyBytesWriter_ResizeAndUpdatePointer() private
1 parent 40ef4e1 commit 0313087

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

Include/cpython/bytesobject.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,6 @@ PyAPI_FUNC(int) PyBytesWriter_Format(
8080
PyAPI_FUNC(int) PyBytesWriter_Resize(
8181
PyBytesWriter *writer,
8282
Py_ssize_t size);
83-
PyAPI_FUNC(void*) PyBytesWriter_ResizeAndUpdatePointer(
84-
PyBytesWriter *writer,
85-
Py_ssize_t size,
86-
void *data);
8783
PyAPI_FUNC(int) PyBytesWriter_Grow(
8884
PyBytesWriter *writer,
8985
Py_ssize_t size);

Objects/bytesobject.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ class bytes "PyBytesObject *" "&PyBytes_Type"
3636
/* Forward declaration */
3737
Py_LOCAL_INLINE(Py_ssize_t) _PyBytesWriter_GetSize(_PyBytesWriter *writer,
3838
char *str);
39+
static void* _PyBytesWriter_ResizeAndUpdatePointer(PyBytesWriter *writer,
40+
Py_ssize_t size, void *data);
3941

4042

4143
#define CHARACTERS _Py_SINGLETON(bytes_characters)
@@ -216,7 +218,6 @@ bytes_fromformat(PyBytesWriter *writer, Py_ssize_t writer_pos,
216218
char buffer[21];
217219

218220
char *s = (char*)PyBytesWriter_GetData(writer) + writer_pos;
219-
Py_ssize_t alloc = PyBytesWriter_GetSize(writer);
220221

221222
#define WRITE_BYTES_LEN(str, len_expr) \
222223
do { \
@@ -2875,7 +2876,7 @@ _PyBytes_FromList(PyObject *x)
28752876
}
28762877

28772878
if (i >= size) {
2878-
str = PyBytesWriter_ResizeAndUpdatePointer(writer, size + 1, str);
2879+
str = _PyBytesWriter_ResizeAndUpdatePointer(writer, size + 1, str);
28792880
if (str == NULL) {
28802881
goto error;
28812882
}
@@ -2969,7 +2970,7 @@ _PyBytes_FromIterator(PyObject *it, PyObject *x)
29692970

29702971
/* Append the byte */
29712972
if (i >= size) {
2972-
str = PyBytesWriter_ResizeAndUpdatePointer(writer, size + 1, str);
2973+
str = _PyBytesWriter_ResizeAndUpdatePointer(writer, size + 1, str);
29732974
if (str == NULL) {
29742975
goto error;
29752976
}
@@ -4025,9 +4026,9 @@ PyBytesWriter_Format(PyBytesWriter *writer, const char *format, ...)
40254026
}
40264027

40274028

4028-
void*
4029-
PyBytesWriter_ResizeAndUpdatePointer(PyBytesWriter *writer, Py_ssize_t size,
4030-
void *data)
4029+
static void*
4030+
_PyBytesWriter_ResizeAndUpdatePointer(PyBytesWriter *writer, Py_ssize_t size,
4031+
void *data)
40314032
{
40324033
Py_ssize_t pos = (char*)data - byteswriter_data(writer);
40334034
if (PyBytesWriter_Resize(writer, size) < 0) {

0 commit comments

Comments
 (0)