svn commit: r302676 - stable/10/usr.sbin/rpcbind/tests

Alan Somers asomers at FreeBSD.org
Tue Jul 12 21:49:09 UTC 2016


Author: asomers
Date: Tue Jul 12 21:49:08 2016
New Revision: 302676
URL: https://svnweb.freebsd.org/changeset/base/302676

Log:
  MFC r301967
  
  Fix usr.sbin/rpcbind ATF tests on 32-bit platforms
  
  usr.sbin/rpcbind/tests/addrmerge_test.c
  	Fix some sizeof calculations that work only by luck on 64-bit
  	platforms.

Modified:
  stable/10/usr.sbin/rpcbind/tests/addrmerge_test.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/rpcbind/tests/addrmerge_test.c
==============================================================================
--- stable/10/usr.sbin/rpcbind/tests/addrmerge_test.c	Tue Jul 12 21:41:27 2016	(r302675)
+++ stable/10/usr.sbin/rpcbind/tests/addrmerge_test.c	Tue Jul 12 21:49:08 2016	(r302676)
@@ -92,15 +92,15 @@ mock_ifaddr4(const char* name, const cha
 
 	in->sin_family = AF_INET;
 	in->sin_port = 0;
-	in->sin_len = sizeof(in);
+	in->sin_len = sizeof(*in);
 	in->sin_addr.s_addr = inet_addr(addr);
 	mask_in->sin_family = AF_INET;
 	mask_in->sin_port = 0;
-	mask_in->sin_len = sizeof(mask_in);
+	mask_in->sin_len = sizeof(*mask_in);
 	mask_in->sin_addr.s_addr = inet_addr(mask);
 	bcast_in->sin_family = AF_INET;
 	bcast_in->sin_port = 0;
-	bcast_in->sin_len = sizeof(bcast_in);
+	bcast_in->sin_len = sizeof(*bcast_in);
 	bcast_in->sin_addr.s_addr = inet_addr(bcast);
 	*ifaddr = (struct ifaddrs) {
 		.ifa_next = NULL,


More information about the svn-src-all mailing list