=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sort/radixsort.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- src/usr.bin/sort/radixsort.c 2015/03/17 17:45:13 1.1 +++ src/usr.bin/sort/radixsort.c 2015/03/17 17:49:27 1.2 @@ -1,4 +1,4 @@ -/* $OpenBSD: radixsort.c,v 1.1 2015/03/17 17:45:13 millert Exp $ */ +/* $OpenBSD: radixsort.c,v 1.2 2015/03/17 17:49:27 millert Exp $ */ /*- * Copyright (C) 2012 Oleg Moskalenko @@ -119,9 +119,7 @@ ssl = sl->sublevels[indx]; if (ssl == NULL) { - ssl = sort_malloc(sizeof(struct sort_level)); - memset(ssl, 0, sizeof(struct sort_level)); - + ssl = sort_calloc(1, sizeof(struct sort_level)); ssl->level = sl->level + 1; sl->sublevels[indx] = ssl; @@ -274,9 +272,7 @@ } sl->sln = 256; - sl->sublevels = sort_malloc(slsz); - memset(sl->sublevels, 0, slsz); - + sl->sublevels = sort_calloc(1, slsz); sl->real_sln = 0; tosort_num = sl->tosort_num; @@ -391,8 +387,7 @@ sl->start_position = 0; sl->sln = 256; - sl->sublevels = sort_malloc(slsz); - memset(sl->sublevels, 0, slsz); + sl->sublevels = sort_calloc(1, slsz); for (i = 0; i < sl->tosort_num; ++i) place_item(sl, i); @@ -459,9 +454,7 @@ { struct sort_level *sl; - sl = sort_malloc(sizeof(struct sort_level)); - memset(sl, 0, sizeof(struct sort_level)); - + sl = sort_calloc(1, sizeof(struct sort_level)); sl->tosort = base; sl->tosort_num = nmemb; sl->tosort_sz = nmemb;