diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2014-06-13 08:28:51 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2014-06-13 08:28:51 +0000 |
| commit | 3fc3c30a2774cda5922eafb418d67093afa0687d (patch) | |
| tree | 636baba6fe8bf97be20b6cb803c09496033ce1e5 /lib | |
| parent | 165a6674ec3570509cf96a632a7a8679e7c51673 (diff) | |
| download | src-3fc3c30a2774cda5922eafb418d67093afa0687d.tar.gz src-3fc3c30a2774cda5922eafb418d67093afa0687d.zip | |
Replace malloc+memset with calloc.
Notes
Notes:
svn path=/head/; revision=267437
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/iconv/citrus_db_factory.c | 4 | ||||
| -rw-r--r-- | lib/libc/iconv/citrus_iconv.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/lib/libc/iconv/citrus_db_factory.c b/lib/libc/iconv/citrus_db_factory.c index e9823ab04393..691fe4e84351 100644 --- a/lib/libc/iconv/citrus_db_factory.c +++ b/lib/libc/iconv/citrus_db_factory.c @@ -270,11 +270,9 @@ _citrus_db_factory_serialize(struct _citrus_db_factory *df, const char *magic, 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) { diff --git a/lib/libc/iconv/citrus_iconv.c b/lib/libc/iconv/citrus_iconv.c index df2ed73ffc7f..5c8bf4923668 100644 --- a/lib/libc/iconv/citrus_iconv.c +++ b/lib/libc/iconv/citrus_iconv.c @@ -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); } |