From e9e95ae93d6b935a271fb047005b7785f5d620b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charles-Fran=C3=A7ois=20Natali?= Date: Wed, 24 Aug 2011 21:40:53 +0200 Subject: [PATCH] sock_sendmsg/sock_recvmsg: Use {0} to 0-initialize aggregate types with automatic storage class. --- Modules/socketmodule.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 9372feaa6ee..936a68dcd6e 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -2780,8 +2780,7 @@ sock_recvmsg_guts(PySocketSockObject *s, struct iovec *iov, int iovlen, int timeout; sock_addr_t addrbuf; socklen_t addrbuflen; - static const struct msghdr msg_blank; - struct msghdr msg; + struct msghdr msg = {0}; PyObject *cmsg_list = NULL, *retval = NULL; void *controlbuf = NULL; struct cmsghdr *cmsgh; @@ -2815,7 +2814,6 @@ sock_recvmsg_guts(PySocketSockObject *s, struct iovec *iov, int iovlen, BEGIN_SELECT_LOOP(s) Py_BEGIN_ALLOW_THREADS; - msg = msg_blank; /* Set all members to 0 or NULL */ msg.msg_name = SAS2SA(&addrbuf); msg.msg_namelen = addrbuflen; msg.msg_iov = iov; @@ -3292,8 +3290,7 @@ sock_sendmsg(PySocketSockObject *s, PyObject *args) Py_buffer *databufs = NULL; struct iovec *iovs = NULL; sock_addr_t addrbuf; - static const struct msghdr msg_blank; - struct msghdr msg; + struct msghdr msg = {0}; struct cmsginfo { int level; int type; @@ -3310,8 +3307,6 @@ sock_sendmsg(PySocketSockObject *s, PyObject *args) &data_arg, &cmsg_arg, &flags, &addr_arg)) return NULL; - msg = msg_blank; /* Set all members to 0 or NULL */ - /* Parse destination address. */ if (addr_arg != NULL && addr_arg != Py_None) { if (!getsockaddrarg(s, addr_arg, SAS2SA(&addrbuf), &addrlen))