svn commit: r312266 - stable/10/contrib/bsnmp/snmpd

[Ngie Cooper]

Author: ngie
Date: Mon Jan 16 07:07:45 2017
New Revision: 312266
URL: https://svnweb.freebsd.org/changeset/base/312266

Log:
  MFC r310656,r311221:
  
  r310656:
  
  style(9): sort alignment in udp_recv(..)
  
  r311221:
  
  Initialize msg.msg_flags to 0
  
  This mutes a valid coverity warning about it being uninitialized
  when passed in to sendmsg(2).
  
  CID:		1368202

Modified:
  stable/10/contrib/bsnmp/snmpd/trans_udp.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/bsnmp/snmpd/trans_udp.c
==============================================================================
--- stable/10/contrib/bsnmp/snmpd/trans_udp.c	Mon Jan 16 07:04:08 2017	(r312265)
+++ stable/10/contrib/bsnmp/snmpd/trans_udp.c	Mon Jan 16 07:07:45 2017	(r312266)
@@ -226,6 +226,7 @@ udp_send(struct tport *tp, const u_char 
 	iov.iov_base = __DECONST(void*, buf);
 	iov.iov_len = len;
 
+	msg.msg_flags = 0;
 	msg.msg_iov = &iov;
 	msg.msg_iovlen = 1;
 	msg.msg_name = __DECONST(void *, addr);
@@ -334,10 +335,10 @@ static ssize_t
 udp_recv(struct tport *tp, struct port_input *pi)
 {
 	struct udp_port *p = (struct udp_port *)tp;
+	struct cmsghdr *cmsgp;
 	struct in_addr *laddr;
 	struct msghdr msg;
 	char cbuf[CMSG_SPACE(sizeof(struct in_addr))];
-	struct cmsghdr *cmsgp;
 	ssize_t ret;
 
 	memset(cbuf, 0, sizeof(cbuf));