Skip to content

Commit 457e21a

Browse files
committed
Rename PyBytesWriter_FinishWithPointer()
1 parent 0a70d70 commit 457e21a

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

Include/cpython/bytesobject.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ PyAPI_FUNC(PyObject*) PyBytesWriter_Finish(
5757
PyAPI_FUNC(PyObject*) PyBytesWriter_FinishWithSize(
5858
PyBytesWriter *writer,
5959
Py_ssize_t size);
60-
PyAPI_FUNC(PyObject*) PyBytesWriter_FinishWithEndPointer(
60+
PyAPI_FUNC(PyObject*) PyBytesWriter_FinishWithPointer(
6161
PyBytesWriter *writer,
6262
void *data);
6363

Modules/_pickle.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2672,7 +2672,7 @@ raw_unicode_escape(PyObject *obj)
26722672
*p++ = (char) ch;
26732673
}
26742674

2675-
return PyBytesWriter_FinishWithEndPointer(writer, p);
2675+
return PyBytesWriter_FinishWithPointer(writer, p);
26762676

26772677
error:
26782678
PyBytesWriter_Discard(writer);

Modules/binascii.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ binascii_b2a_uu_impl(PyObject *module, Py_buffer *data, int backtick)
355355
}
356356
*ascii_data++ = '\n'; /* Append a courtesy newline */
357357

358-
return PyBytesWriter_FinishWithEndPointer(writer, ascii_data);
358+
return PyBytesWriter_FinishWithPointer(writer, ascii_data);
359359
}
360360

361361
/*[clinic input]
@@ -506,7 +506,7 @@ binascii_a2b_base64_impl(PyObject *module, Py_buffer *data, int strict_mode)
506506
}
507507

508508
done:
509-
return PyBytesWriter_FinishWithEndPointer(writer, bin_data);
509+
return PyBytesWriter_FinishWithPointer(writer, bin_data);
510510

511511
error_end:
512512
PyBytesWriter_Discard(writer);
@@ -586,7 +586,7 @@ binascii_b2a_base64_impl(PyObject *module, Py_buffer *data, int newline)
586586
if (newline)
587587
*ascii_data++ = '\n'; /* Append a courtesy newline */
588588

589-
return PyBytesWriter_FinishWithEndPointer(writer, ascii_data);
589+
return PyBytesWriter_FinishWithPointer(writer, ascii_data);
590590
}
591591

592592

Objects/bytesobject.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ PyBytes_FromFormatV(const char *format, va_list vargs)
392392
return NULL;
393393
}
394394

395-
return PyBytesWriter_FinishWithEndPointer(writer, s);
395+
return PyBytesWriter_FinishWithPointer(writer, s);
396396
}
397397

398398

@@ -1070,7 +1070,7 @@ _PyBytes_FormatEx(const char *format, Py_ssize_t format_len,
10701070
if (args_owned) {
10711071
Py_DECREF(args);
10721072
}
1073-
return PyBytesWriter_FinishWithEndPointer(writer, res);
1073+
return PyBytesWriter_FinishWithPointer(writer, res);
10741074

10751075
error:
10761076
PyBytesWriter_Discard(writer);
@@ -1184,7 +1184,7 @@ PyObject *_PyBytes_DecodeEscape(const char *s,
11841184
}
11851185
}
11861186

1187-
return PyBytesWriter_FinishWithEndPointer(writer, p);
1187+
return PyBytesWriter_FinishWithPointer(writer, p);
11881188

11891189
failed:
11901190
PyBytesWriter_Discard(writer);
@@ -2593,7 +2593,7 @@ _PyBytes_FromHex(PyObject *string, int use_bytearray)
25932593
if (view.obj != NULL) {
25942594
PyBuffer_Release(&view);
25952595
}
2596-
return PyBytesWriter_FinishWithEndPointer(writer, buf);
2596+
return PyBytesWriter_FinishWithPointer(writer, buf);
25972597

25982598
error:
25992599
if (invalid_char == -1) {
@@ -2886,7 +2886,7 @@ _PyBytes_FromList(PyObject *x)
28862886
}
28872887
*str++ = (char) value;
28882888
}
2889-
return PyBytesWriter_FinishWithEndPointer(writer, str);
2889+
return PyBytesWriter_FinishWithPointer(writer, str);
28902890

28912891
error:
28922892
PyBytesWriter_Discard(writer);
@@ -2980,7 +2980,7 @@ _PyBytes_FromIterator(PyObject *it, PyObject *x)
29802980
}
29812981
*str++ = (char) value;
29822982
}
2983-
return PyBytesWriter_FinishWithEndPointer(writer, str);
2983+
return PyBytesWriter_FinishWithPointer(writer, str);
29842984

29852985
error:
29862986
PyBytesWriter_Discard(writer);
@@ -3921,7 +3921,7 @@ PyBytesWriter_Finish(PyBytesWriter *writer)
39213921

39223922

39233923
PyObject*
3924-
PyBytesWriter_FinishWithEndPointer(PyBytesWriter *writer, void *data)
3924+
PyBytesWriter_FinishWithPointer(PyBytesWriter *writer, void *data)
39253925
{
39263926
Py_ssize_t size = (char*)data - byteswriter_data(writer);
39273927
if (size < 0 || size > byteswriter_allocated(writer)) {

0 commit comments

Comments
 (0)