Date: Fri, 13 Jun 2014 08:28:51 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r267437 - head/lib/libc/iconv Message-ID: <201406130828.s5D8Sp7h071474@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406130828.s5D8Sp7h071474>