svn commit: r267437 - head/lib/libc/iconv

[Tijl Coosemans]

Author: tijl
Date: Fri Jun 13 08:28:51 2014
New Revision: 267437
URL: http://svnweb.freebsd.org/changeset/base/267437

Log:
  Replace malloc+memset with calloc.

Modified:
  head/lib/libc/iconv/citrus_db_factory.c
  head/lib/libc/iconv/citrus_iconv.c

Modified: head/lib/libc/iconv/citrus_db_factory.c
==============================================================================
--- head/lib/libc/iconv/citrus_db_factory.c	Fri Jun 13 08:26:53 2014	(r267436)
+++ head/lib/libc/iconv/citrus_db_factory.c	Fri Jun 13 08:28:51 2014	(r267437)
@@ -270,11 +270,9 @@ _citrus_db_factory_serialize(struct _cit
 		return (0);
 	}
 	/* allocate hash table */
-	depp = malloc(sizeof(*depp) * df->df_num_entries);
+	depp = calloc(df->df_num_entries, sizeof(*depp));
 	if (depp == NULL)
 		return (-1);
-	for (i = 0; i < df->df_num_entries; i++)
-		depp[i] = NULL;
 
 	/* step1: store the entries which are not conflicting */
 	STAILQ_FOREACH(de, &df->df_entries, de_entry) {

Modified: head/lib/libc/iconv/citrus_iconv.c
==============================================================================
--- head/lib/libc/iconv/citrus_iconv.c	Fri Jun 13 08:26:53 2014	(r267436)
+++ head/lib/libc/iconv/citrus_iconv.c	Fri Jun 13 08:28:51 2014	(r267437)
@@ -344,9 +344,8 @@ const char
 {
 	char *buf;
 
-	if ((buf = malloc((size_t)PATH_MAX)) == NULL)
+	if ((buf = calloc((size_t)PATH_MAX, sizeof(*buf))) == NULL)
 		return (NULL);
-	memset((void *)buf, 0, (size_t)PATH_MAX);
 	_citrus_esdb_alias(name, buf, (size_t)PATH_MAX);
 	return (buf);
 }