Skip to content

Commit

Permalink
tests: rename size to nbytes
Browse files Browse the repository at this point in the history
  • Loading branch information
vstinner committed Jun 21, 2024
1 parent 3a08491 commit a9a9083
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions Modules/_testlimitedcapi/unicode.c
Original file line number Diff line number Diff line change
Expand Up @@ -1848,9 +1848,9 @@ unicode_export(PyObject *self, PyObject *args)
return NULL;
}

Py_ssize_t size;
Py_ssize_t nbytes;
uint32_t format;
const char *data = PyUnicode_Export(obj, requested_formats, &size, &format);
const char *data = PyUnicode_Export(obj, requested_formats, &nbytes, &format);
if (data == NULL) {
return NULL;
}
Expand All @@ -1860,24 +1860,24 @@ unicode_export(PyObject *self, PyObject *args)
{
case PyUnicode_FORMAT_ASCII:
case PyUnicode_FORMAT_UCS1:
assert(data[size] == 0);
assert(data[nbytes] == 0);
break;
case PyUnicode_FORMAT_UCS2:
assert(data[size] == 0);
assert(data[size+1] == 0);
assert(data[nbytes] == 0);
assert(data[nbytes+1] == 0);
break;
case PyUnicode_FORMAT_UCS4:
assert(data[size] == 0);
assert(data[size+1] == 0);
assert(data[size+2] == 0);
assert(data[size+3] == 0);
assert(data[nbytes] == 0);
assert(data[nbytes+1] == 0);
assert(data[nbytes+2] == 0);
assert(data[nbytes+3] == 0);
break;
case PyUnicode_FORMAT_UTF8:
assert(data[size] == 0);
assert(data[nbytes] == 0);
break;
}

PyObject *res = Py_BuildValue("y#I", data, size, (unsigned int)format);
PyObject *res = Py_BuildValue("y#I", data, nbytes, (unsigned int)format);
PyUnicode_ReleaseExport(obj, data, format);
return res;
}
Expand All @@ -1888,12 +1888,12 @@ static PyObject*
unicode_import(PyObject *self, PyObject *args)
{
const void *data;
Py_ssize_t size;
Py_ssize_t nbytes;
unsigned int format;
if (!PyArg_ParseTuple(args, "y#I", &data, &size, &format)) {
if (!PyArg_ParseTuple(args, "y#I", &data, &nbytes, &format)) {
return NULL;
}
return PyUnicode_Import(data, size, format);
return PyUnicode_Import(data, nbytes, format);
}


Expand Down

0 comments on commit a9a9083

Please sign in to comment.