svn commit: r310910 - stable/10/contrib/bsnmp/lib

[Ngie Cooper]

Author: ngie
Date: Sat Dec 31 10:40:59 2016
New Revision: 310910
URL: https://svnweb.freebsd.org/changeset/base/310910

Log:
  MFstable/11 r310909:
  
  MFC r310500,r310660:
  
  r310500:
  
  Minor style(9) fixes
  
  - Trailing whitespace cleanup
  - Sort variables in snmp_dialog(..) by alignment
  
  No functional change
  
  r310660:
  
  style(9): fix whitespace in pdu_encode_secparams(..)

Modified:
  stable/10/contrib/bsnmp/lib/snmp.c
  stable/10/contrib/bsnmp/lib/snmpclient.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/bsnmp/lib/snmp.c
==============================================================================
--- stable/10/contrib/bsnmp/lib/snmp.c	Sat Dec 31 10:40:02 2016	(r310909)
+++ stable/10/contrib/bsnmp/lib/snmp.c	Sat Dec 31 10:40:59 2016	(r310910)
@@ -355,8 +355,8 @@ static enum snmp_code
 pdu_encode_secparams(struct asn_buf *b, struct snmp_pdu *pdu)
 {
 	u_char buf[256], *sptr;
-        struct asn_buf tb;
-        size_t auth_off, moved = 0;
+	struct asn_buf tb;
+	size_t auth_off, moved = 0;
 
 	auth_off = 0;
 	memset(buf, 0, 256);

Modified: stable/10/contrib/bsnmp/lib/snmpclient.c
==============================================================================
--- stable/10/contrib/bsnmp/lib/snmpclient.c	Sat Dec 31 10:40:02 2016	(r310909)
+++ stable/10/contrib/bsnmp/lib/snmpclient.c	Sat Dec 31 10:40:59 2016	(r310910)
@@ -1214,7 +1214,7 @@ snmp_next_reqid(struct snmp_client * c)
 	int32_t i;
 
 	i = c->next_reqid;
-	if (c->next_reqid >= c->max_reqid)	
+	if (c->next_reqid >= c->max_reqid)
 		c->next_reqid = c->min_reqid;
 	else
 		c->next_reqid++;
@@ -1230,7 +1230,7 @@ snmp_send_packet(struct snmp_pdu * pdu)
         u_char *buf;
         struct asn_buf b;
         ssize_t ret;
- 
+
 	if ((buf = malloc(snmp_client.txbuflen)) == NULL) {
 		seterr(&snmp_client, "%s", strerror(errno));
 		return (-1);
@@ -1684,9 +1684,9 @@ snmp_dialog(struct snmp_v1_pdu *req, str
 	struct timeval tv = snmp_client.timeout;
 	struct timeval end;
 	struct snmp_pdu pdu;
-	u_int i;
-	int32_t reqid;
 	int ret;
+	int32_t reqid;
+	u_int i;
 
 	/*
 	 * Make a copy of the request and replace the syntaxes by NULL