diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-04-12 21:27:45 -0700 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-19 21:40:25 +0200 |
| commit | 7d7224d8543e85e3a34a1cddf99f3eac9aa9050b (patch) | |
| tree | 15e7affd8446b031fe6bc98bcb5b0419dc04ab7b /nx-X11/lib/X11/lcDB.c | |
| parent | 369c956683108226a30bbdd55355f0d8ae57eeb4 (diff) | |
| download | nx-libs-7d7224d8543e85e3a34a1cddf99f3eac9aa9050b.tar.gz nx-libs-7d7224d8543e85e3a34a1cddf99f3eac9aa9050b.tar.bz2 nx-libs-7d7224d8543e85e3a34a1cddf99f3eac9aa9050b.zip | |
Replace Xmalloc+bzero pairs with Xcalloc calls
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
Diffstat (limited to 'nx-X11/lib/X11/lcDB.c')
| -rw-r--r-- | nx-X11/lib/X11/lcDB.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nx-X11/lib/X11/lcDB.c b/nx-X11/lib/X11/lcDB.c index 1353acfe3..c11a79a6b 100644 --- a/nx-X11/lib/X11/lcDB.c +++ b/nx-X11/lib/X11/lcDB.c @@ -591,11 +591,10 @@ store_to_database( goto err; } - new = (Database)Xmalloc(sizeof(DatabaseRec)); + new = Xcalloc(1, sizeof(DatabaseRec)); if (new == (Database)NULL) { goto err; } - bzero(new, sizeof(DatabaseRec)); new->category = (char *)Xmalloc(strlen(parse_info.category) + 1); if (new->category == NULL) { @@ -1309,10 +1308,9 @@ _XlcCreateLocaleDataBase( return (XPointer)NULL; } n = CountDatabase(database); - lc_db = (XlcDatabase)Xmalloc(sizeof(XlcDatabaseRec) * (n + 1)); + lc_db = Xcalloc(n + 1, sizeof(XlcDatabaseRec)); if (lc_db == (XlcDatabase)NULL) goto err; - bzero(lc_db, sizeof(XlcDatabaseRec) * (n + 1)); for (p = database, i = 0; p && i < n; p = p->next, ++i) { lc_db[i].category_q = XrmStringToQuark(p->category); lc_db[i].name_q = XrmStringToQuark(p->name); |