Commit d532ba07 authored by Martin v. Löwis's avatar Martin v. Löwis

Explain why 'consumed' is initialized.

parent d004fc81
...@@ -319,12 +319,11 @@ utf_16_decode(PyObject *self, ...@@ -319,12 +319,11 @@ utf_16_decode(PyObject *self,
if (!PyArg_ParseTuple(args, "t#|zi:utf_16_decode", if (!PyArg_ParseTuple(args, "t#|zi:utf_16_decode",
&data, &size, &errors, &final)) &data, &size, &errors, &final))
return NULL; return NULL;
/* XXX Why is consumed initialized to size? mvl */
if (size < 0) { if (size < 0) {
PyErr_SetString(PyExc_ValueError, "negative argument"); PyErr_SetString(PyExc_ValueError, "negative argument");
return 0; return 0;
} }
consumed = size; consumed = size; /* This is overwritten unless final is true. */
decoded = PyUnicode_DecodeUTF16Stateful(data, size, errors, &byteorder, decoded = PyUnicode_DecodeUTF16Stateful(data, size, errors, &byteorder,
final ? NULL : &consumed); final ? NULL : &consumed);
if (decoded == NULL) if (decoded == NULL)
...@@ -348,12 +347,11 @@ utf_16_le_decode(PyObject *self, ...@@ -348,12 +347,11 @@ utf_16_le_decode(PyObject *self,
&data, &size, &errors, &final)) &data, &size, &errors, &final))
return NULL; return NULL;
/* XXX Why is consumed initialized to size? mvl */
if (size < 0) { if (size < 0) {
PyErr_SetString(PyExc_ValueError, "negative argument"); PyErr_SetString(PyExc_ValueError, "negative argument");
return 0; return 0;
} }
consumed = size; consumed = size; /* This is overwritten unless final is true. */
decoded = PyUnicode_DecodeUTF16Stateful(data, size, errors, decoded = PyUnicode_DecodeUTF16Stateful(data, size, errors,
&byteorder, final ? NULL : &consumed); &byteorder, final ? NULL : &consumed);
if (decoded == NULL) if (decoded == NULL)
...@@ -377,12 +375,11 @@ utf_16_be_decode(PyObject *self, ...@@ -377,12 +375,11 @@ utf_16_be_decode(PyObject *self,
if (!PyArg_ParseTuple(args, "t#|zi:utf_16_be_decode", if (!PyArg_ParseTuple(args, "t#|zi:utf_16_be_decode",
&data, &size, &errors, &final)) &data, &size, &errors, &final))
return NULL; return NULL;
/* XXX Why is consumed initialized to size? mvl */
if (size < 0) { if (size < 0) {
PyErr_SetString(PyExc_ValueError, "negative argument"); PyErr_SetString(PyExc_ValueError, "negative argument");
return 0; return 0;
} }
consumed = size; consumed = size; /* This is overwritten unless final is true. */
decoded = PyUnicode_DecodeUTF16Stateful(data, size, errors, decoded = PyUnicode_DecodeUTF16Stateful(data, size, errors,
&byteorder, final ? NULL : &consumed); &byteorder, final ? NULL : &consumed);
if (decoded == NULL) if (decoded == NULL)
...@@ -413,12 +410,11 @@ utf_16_ex_decode(PyObject *self, ...@@ -413,12 +410,11 @@ utf_16_ex_decode(PyObject *self,
if (!PyArg_ParseTuple(args, "t#|zii:utf_16_ex_decode", if (!PyArg_ParseTuple(args, "t#|zii:utf_16_ex_decode",
&data, &size, &errors, &byteorder, &final)) &data, &size, &errors, &byteorder, &final))
return NULL; return NULL;
/* XXX Why is consumed initialized to size? mvl */
if (size < 0) { if (size < 0) {
PyErr_SetString(PyExc_ValueError, "negative argument"); PyErr_SetString(PyExc_ValueError, "negative argument");
return 0; return 0;
} }
consumed = size; consumed = size; /* This is overwritten unless final is true. */
unicode = PyUnicode_DecodeUTF16Stateful(data, size, errors, &byteorder, unicode = PyUnicode_DecodeUTF16Stateful(data, size, errors, &byteorder,
final ? NULL : &consumed); final ? NULL : &consumed);
if (unicode == NULL) if (unicode == NULL)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment