X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=libiberty%2Fsort.c;h=0267fdb230e3bdae067211de767a5b0c83298c1d;hb=4b4477b52eee60ddadd59c36ffd778bbd9ab1c07;hp=da2d660b6f5d743655dc1876a442af38bae46cd9;hpb=5c82d20a26d0b283c831dba782731b4273f4d4d8;p=deliverable%2Fbinutils-gdb.git diff --git a/libiberty/sort.c b/libiberty/sort.c index da2d660b6f..0267fdb230 100644 --- a/libiberty/sort.c +++ b/libiberty/sort.c @@ -1,5 +1,5 @@ /* Sorting algorithms. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000-2019 Free Software Foundation, Inc. Contributed by Mark Mitchell . This file is part of GNU CC. @@ -16,15 +16,20 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU CC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, 51 Franklin Street - Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H #include "config.h" #endif #include "libiberty.h" #include "sort.h" +#ifdef HAVE_LIMITS_H #include +#endif +#ifdef HAVE_SYS_PARAM_H +#include +#endif #ifdef HAVE_STDLIB_H #include #endif @@ -39,10 +44,7 @@ Boston, MA 02111-1307, USA. */ /* POINTERS and WORK are both arrays of N pointers. When this function returns POINTERS will be sorted in ascending order. */ -void sort_pointers (n, pointers, work) - size_t n; - void **pointers; - void **work; +void sort_pointers (size_t n, void **pointers, void **work) { /* The type of a single digit. This can be any unsigned integral type. When changing this, DIGIT_MAX should be changed as @@ -135,8 +137,7 @@ void sort_pointers (n, pointers, work) #include -void *xmalloc (n) - size_t n; +void *xmalloc (size_t n) { return malloc (n); } @@ -154,8 +155,8 @@ int main (int argc, char **argv) else k = 10; - pointers = xmalloc (k * sizeof (void *)); - work = xmalloc (k * sizeof (void *)); + pointers = XNEWVEC (void*, k); + work = XNEWVEC (void*, k); for (i = 0; i < k; ++i) {