mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup socketmodule.c 

Issue #27744:

* PEP 7: add {...} around if blocks
* assign variables and then check their value in if() to make the code easier
  to read and to debug.
This commit is contained in:
Victor Stinner 2016-09-12 11:45:59 +02:00
parent eece2229e2
commit 288b5bf624
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Modules/socketmodule.c
View File

@ -3920,21 +3920,33 @@ sock_sendmsg_iovec(PySocketSockObject *s, PyObject *data_arg,
/* Fill in an iovec for each message part, and save the Py_buffer /* Fill in an iovec for each message part, and save the Py_buffer
structs to release afterwards. */ structs to release afterwards. */
if ((data_fast = PySequence_Fast(data_arg, data_fast = PySequence_Fast(data_arg,
"sendmsg() argument 1 must be an " "sendmsg() argument 1 must be an "
"iterable")) == NULL) "iterable");
if (data_fast == NULL) {
goto finally; goto finally;
}
ndataparts = PySequence_Fast_GET_SIZE(data_fast); ndataparts = PySequence_Fast_GET_SIZE(data_fast);
if (ndataparts > INT_MAX) { if (ndataparts > INT_MAX) {
PyErr_SetString(PyExc_OSError, "sendmsg() argument 1 is too long"); PyErr_SetString(PyExc_OSError, "sendmsg() argument 1 is too long");
goto finally; goto finally;
} }
msg->msg_iovlen = ndataparts; msg->msg_iovlen = ndataparts;
if (ndataparts > 0 && if (ndataparts > 0) {
((msg->msg_iov = iovs = PyMem_New(struct iovec, ndataparts)) == NULL || iovs = PyMem_New(struct iovec, ndataparts);
(databufs = PyMem_New(Py_buffer, ndataparts)) == NULL)) { if (iovs == NULL) {
PyErr_NoMemory(); PyErr_NoMemory();
goto finally; goto finally;
}
msg->msg_iov = iovs;
databufs = PyMem_New(Py_buffer, ndataparts);
if (iovs == NULL) {
PyErr_NoMemory();
goto finally;
}
} }
for (; ndatabufs < ndataparts; ndatabufs++) { for (; ndatabufs < ndataparts; ndatabufs++) {
if (!PyArg_Parse(PySequence_Fast_GET_ITEM(data_fast, ndatabufs), if (!PyArg_Parse(PySequence_Fast_GET_ITEM(data_fast, ndatabufs),
@ -3970,7 +3982,7 @@ sock_sendmsg(PySocketSockObject *s, PyObject *args)
Py_ssize_t i, ndatabufs = 0, ncmsgs, ncmsgbufs = 0; Py_ssize_t i, ndatabufs = 0, ncmsgs, ncmsgbufs = 0;
Py_buffer *databufs = NULL; Py_buffer *databufs = NULL;
sock_addr_t addrbuf; sock_addr_t addrbuf;
struct msghdr msg = {0}; struct msghdr msg;
struct cmsginfo { struct cmsginfo {
int level; int level;
int type; int type;
@ -3984,8 +3996,11 @@ sock_sendmsg(PySocketSockObject *s, PyObject *args)
struct sock_sendmsg ctx; struct sock_sendmsg ctx;
if (!PyArg_ParseTuple(args, "O|OiO:sendmsg", if (!PyArg_ParseTuple(args, "O|OiO:sendmsg",
&data_arg, &cmsg_arg, &flags, &addr_arg)) &data_arg, &cmsg_arg, &flags, &addr_arg)) {
return NULL; return NULL;
}
memset(&msg, 0, sizeof(msg));
/* Parse destination address. */ /* Parse destination address. */
if (addr_arg != NULL && addr_arg != Py_None) { if (addr_arg != NULL && addr_arg != Py_None) {
@ -4189,8 +4204,11 @@ sock_sendmsg_afalg(PySocketSockObject *self, PyObject *args, PyObject *kwds)
"|O$O!y*O!i:sendmsg_afalg", keywords, "|O$O!y*O!i:sendmsg_afalg", keywords,
&data_arg, &data_arg,
&PyLong_Type, &opobj, &iv, &PyLong_Type, &opobj, &iv,
&PyLong_Type, &assoclenobj, &flags)) &PyLong_Type, &assoclenobj, &flags)) {
return NULL; return NULL;
}
memset(&msg, 0, sizeof(msg));
/* op is a required, keyword-only argument >= 0 */ /* op is a required, keyword-only argument >= 0 */
if (opobj != NULL) { if (opobj != NULL) {
@ -4229,7 +4247,6 @@ sock_sendmsg_afalg(PySocketSockObject *self, PyObject *args, PyObject *kwds)
} }
memset(controlbuf, 0, controllen); memset(controlbuf, 0, controllen);
memset(&msg, 0, sizeof(msg));
msg.msg_controllen = controllen; msg.msg_controllen = controllen;
msg.msg_control = controlbuf; msg.msg_control = controlbuf;
@ -4287,8 +4304,9 @@ sock_sendmsg_afalg(PySocketSockObject *self, PyObject *args, PyObject *kwds)
ctx.msg = &msg; ctx.msg = &msg;
ctx.flags = flags; ctx.flags = flags;
if (sock_call(self, 1, sock_sendmsg_impl, &ctx) < 0) if (sock_call(self, 1, sock_sendmsg_impl, &ctx) < 0) {
goto finally; goto finally;
}
retval = PyLong_FromSsize_t(ctx.result); retval = PyLong_FromSsize_t(ctx.result);