From owner-svn-src-stable-8@FreeBSD.ORG  Fri Jan 18 17:48:11 2013
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 8B74A9DA;
 Fri, 18 Jan 2013 17:48:11 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7D269C1C;
 Fri, 18 Jan 2013 17:48:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0IHmBa3083261;
 Fri, 18 Jan 2013 17:48:11 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0IHmBqI083260;
 Fri, 18 Jan 2013 17:48:11 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201301181748.r0IHmBqI083260@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 18 Jan 2013 17:48:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r245608 - stable/8/usr.sbin/pkg
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
 <svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-8>, 
 <mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
 <mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Jan 2013 17:48:11 -0000

Author: bapt
Date: Fri Jan 18 17:48:10 2013
New Revision: 245608
URL: http://svnweb.freebsd.org/changeset/base/245608

Log:
  MFC: r245412
  Directly uses calloc(3) instread of malloc(3) + memset(3)
  
  Reported by:	Jeremy Chadwick <jdc@koitsu.org>

Modified:
  stable/8/usr.sbin/pkg/dns_utils.c
Directory Properties:
  stable/8/usr.sbin/pkg/   (props changed)

Modified: stable/8/usr.sbin/pkg/dns_utils.c
==============================================================================
--- stable/8/usr.sbin/pkg/dns_utils.c	Fri Jan 18 16:32:33 2013	(r245607)
+++ stable/8/usr.sbin/pkg/dns_utils.c	Fri Jan 18 17:48:10 2013	(r245608)
@@ -66,10 +66,9 @@ dns_getsrvinfo(const char *zone)
 		p += len + NS_QFIXEDSZ;
 	}
 
-	res = malloc(sizeof(struct dns_srvinfo) * ancount);
+	res = calloc(ancount, sizeof(struct dns_srvinfo));
 	if (res == NULL)
 		return (NULL);
-	memset(res, 0, sizeof(struct dns_srvinfo) * ancount);
 
 	n = 0;
 	while (ancount > 0 && p < end) {