Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 28 May 2017 02:55:05 +0000 (UTC)
From:      Ngie Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r319027 - head/lib/libc/tests/nss
Message-ID:  <201705280255.v4S2t5L2051363@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: ngie
Date: Sun May 28 02:55:04 2017
New Revision: 319027
URL: https://svnweb.freebsd.org/changeset/base/319027

Log:
  lib/libc/tests/nss: use calloc appropriately
  
  The pattern used prior to this commit was `calloc(1, n * sizeof(type))`;
  the pattern that should be used however is `calloc(n, sizeof(type))`.
  
  MFC after:	3 days
  Sponsored by:	Dell EMC Isilon

Modified:
  head/lib/libc/tests/nss/getgr_test.c
  head/lib/libc/tests/nss/gethostby_test.c
  head/lib/libc/tests/nss/getproto_test.c
  head/lib/libc/tests/nss/getrpc_test.c
  head/lib/libc/tests/nss/getserv_test.c

Modified: head/lib/libc/tests/nss/getgr_test.c
==============================================================================
--- head/lib/libc/tests/nss/getgr_test.c	Sun May 28 02:15:57 2017	(r319026)
+++ head/lib/libc/tests/nss/getgr_test.c	Sun May 28 02:55:04 2017	(r319027)
@@ -104,7 +104,7 @@ clone_group(struct group *dest, struct g
 		for (cp = src->gr_mem; *cp; ++cp)
 			++members_num;
 
-		dest->gr_mem = calloc(1, (members_num + 1) * sizeof(char *));
+		dest->gr_mem = calloc(members_num + 1, sizeof(char *));
 		ATF_REQUIRE(dest->gr_mem != NULL);
 
 		for (cp = src->gr_mem; *cp; ++cp) {

Modified: head/lib/libc/tests/nss/gethostby_test.c
==============================================================================
--- head/lib/libc/tests/nss/gethostby_test.c	Sun May 28 02:15:57 2017	(r319026)
+++ head/lib/libc/tests/nss/gethostby_test.c	Sun May 28 02:55:04 2017	(r319027)
@@ -163,8 +163,7 @@ clone_hostent(struct hostent *dest, stru
 		for (cp = src->h_aliases; *cp; ++cp)
 			++aliases_num;
 
-		dest->h_aliases = calloc(1, (aliases_num + 1) *
-			sizeof(char *));
+		dest->h_aliases = calloc(aliases_num + 1, sizeof(char *));
 		ATF_REQUIRE(dest->h_aliases != NULL);
 
 		for (cp = src->h_aliases; *cp; ++cp) {
@@ -178,7 +177,7 @@ clone_hostent(struct hostent *dest, stru
 		for (cp = src->h_addr_list; *cp; ++cp)
 			++addrs_num;
 
-		dest->h_addr_list = calloc(1, (addrs_num + 1) * sizeof(char *));
+		dest->h_addr_list = calloc(addrs_num + 1, sizeof(char *));
 		ATF_REQUIRE(dest->h_addr_list != NULL);
 
 		for (cp = src->h_addr_list; *cp; ++cp) {

Modified: head/lib/libc/tests/nss/getproto_test.c
==============================================================================
--- head/lib/libc/tests/nss/getproto_test.c	Sun May 28 02:15:57 2017	(r319026)
+++ head/lib/libc/tests/nss/getproto_test.c	Sun May 28 02:55:04 2017	(r319027)
@@ -99,7 +99,7 @@ clone_protoent(struct protoent *dest, st
 		for (cp = src->p_aliases; *cp; ++cp)
 			++aliases_num;
 
-		dest->p_aliases = calloc(1, (aliases_num+1) * sizeof(char *));
+		dest->p_aliases = calloc(aliases_num + 1, sizeof(char *));
 		assert(dest->p_aliases != NULL);
 
 		for (cp = src->p_aliases; *cp; ++cp) {

Modified: head/lib/libc/tests/nss/getrpc_test.c
==============================================================================
--- head/lib/libc/tests/nss/getrpc_test.c	Sun May 28 02:15:57 2017	(r319026)
+++ head/lib/libc/tests/nss/getrpc_test.c	Sun May 28 02:55:04 2017	(r319027)
@@ -100,7 +100,7 @@ clone_rpcent(struct rpcent *dest, struct
 		for (cp = src->r_aliases; *cp; ++cp)
 			++aliases_num;
 
-		dest->r_aliases = calloc(1, (aliases_num + 1) * sizeof(char *));
+		dest->r_aliases = calloc(aliases_num + 1, sizeof(char *));
 		ATF_REQUIRE(dest->r_aliases != NULL);
 
 		for (cp = src->r_aliases; *cp; ++cp) {

Modified: head/lib/libc/tests/nss/getserv_test.c
==============================================================================
--- head/lib/libc/tests/nss/getserv_test.c	Sun May 28 02:15:57 2017	(r319026)
+++ head/lib/libc/tests/nss/getserv_test.c	Sun May 28 02:55:04 2017	(r319027)
@@ -102,7 +102,7 @@ clone_servent(struct servent *dest, stru
 		for (cp = src->s_aliases; *cp; ++cp)
 			++aliases_num;
 
-		dest->s_aliases = calloc(1, (aliases_num + 1) * sizeof(char *));
+		dest->s_aliases = calloc(aliases_num + 1, sizeof(char *));
 		ATF_REQUIRE(dest->s_aliases != NULL);
 
 		for (cp = src->s_aliases; *cp; ++cp) {

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705280255.v4S2t5L2051363>