diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-02-10 03:19:57 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-02-10 03:19:57 +0000 |
commit | 7cc27f440c2f709fda63af7ecb3747deeeb799f0 (patch) | |
tree | 01e140591e31d13b80fe5acb882781b94c4e9968 /stdlib/qsort.c | |
parent | 6952e59e25071a5c18a28c32dbcc93fcfe8f9d62 (diff) | |
download | glibc-7cc27f440c2f709fda63af7ecb3747deeeb799f0.tar glibc-7cc27f440c2f709fda63af7ecb3747deeeb799f0.tar.gz glibc-7cc27f440c2f709fda63af7ecb3747deeeb799f0.tar.bz2 glibc-7cc27f440c2f709fda63af7ecb3747deeeb799f0.zip |
update from main archive 970209cvs/libc-970210
1997-02-09 02:59 Ulrich Drepper <drepper@cygnus.com>
* version.h (VERSION): Bump to 2.0.2.
* posix/Makefile (routines): Add getopt_init.
* posix/getopt.c: Don't get environment variable with nonoption
flags here. Depend on __getopt_nonoption_flags variable filled
somewhere else. This is necessary since the variable must be
removed even when getopt isn't used in case exec(2) gets called.
* posix/getopt_init.c: New file. Initialize __getopt_nonoption_flags
and remove environment variable.
* sysdeps/i386/init-first.c: Call __getopt_clean_environment.
* sysdeps/mach/hurd/i386/init-first.c: Likewise.
* sysdeps/stub/init-first.c: Likewise.
* sysdeps/unix/sysv/linux/init-first.c: Likewise.
* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Recognize
AT_PAGESZ entry in auxiliary vector and store value in _dl_pagesize.
* sysdeps/generic/crypt-entry.h: Return EOPNOTSUPP when DES
encryption is wanted.
* libio/vsnprintf.c: If MAXLEN is 0 return 0.
* stdio/vsnprintf.c: Likewise.
Reported by Philip Blundell <pjb27@cam.ac.uk>.
1997-02-07 17:43 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/generic/sysd-stdio.c: Include <errno.h>.
Change PTR to void *.
* sysdeps/posix/vdprintf.c: Change PTR to void *.
Reported by Brian Oxley <boxley%dev.cm.ssb.com@clipper.ssb.com>.
1997-02-07 17:41 Philip Blundell <pjb27@cam.ac.uk>
* sysdeps/unix/sysv/linux/socketbits.h: Fix typo.
1997-02-06 13:49 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* rellns-sh: No need to check for existance of first parameter.
1997-02-06 14:50 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/posix/getcwd.c (__getcwd): Fix resource leaks. Reported
by David Holland <dholland@eecs.harvard.edu>.
1997-02-06 14:38 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sunrpc/clnt_tcp.c (readtcp): Pass copy of timeout value to
select, in case it is modified by the latter.
* sunrpc/clnt_udp.c (clntudp_call): Likewise.
* sunrpc/pmap_rmt.c (clnt_broadcast): Likewise.
* sunrpc/svc_tcp.c (readtcp): Likewise.
* sunrpc/svc_authux.c (_svcauth_unix): Fix type of area_gids
array.
* sunrpc/authuxprot.c (xdr_authunix_parms): Check size of uid_t
and gid_t.
* sunrpc/auth_unix.c (authunix_validate): Fix type of second
argument.
1997-02-06 14:29 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* elf/Makefile (extra-objs): Don't zap previous value.
* Makefile (before-compile): Likewise. Don't add gnu/lib-names.h
twice.
1997-02-06 14:19 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/brk.c: Add workaround for
braindamage (sigh!).
1997-02-06 17:10 Jim Meyering <meyering@asic.sc.ti.com>
* manual/memory.texi: Correct `copystring' example for obstacks.
1997-02-06 14:10 Ulrich Drepper <drepper@cygnus.com>
* Makeconfig: Don't use [:lower:] and [:upper:] in tr since old
GNU tr don't grok it.
1997-02-03 21:13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/socketbits.h [__GNUC__<2] (struct cmsghdr):
Don't use GNU C extensions.
(CMSG_DATA): Use portable definition.
1997-02-05 05:58 Ulrich Drepper <drepper@cygnus.com>
* elf/ldd.bash.in: Add test for read permission and print appropriate
message. Change warning and error messages to print "ldd: " at start.
* elf/ldd.sh.in: Likewise.
* stdlib/Makefile (routines): Add atoll.
* stdlib/atoll.c: New file.
* stdlib/stdlib.h: Add prototype and optimization for atoll.
* stdlib/a64l.c: Update copyright.
* stdlib/abs.c: Likewise.
* stdlib/atof.c: Likewise.
* stdlib/atoi.c: Likewise.
* stdlib/atol.c: Likewise.
* stdlib/bsearch.c: Likewise.
* stdlib/exit.c: Likewise.
* stdlib/fpioconst.c: Likewise.
* stdlib/fpioconst.h: Likewise.
* stdlib/jrand48.c: Likewise.
* stdlib/jrand48_r.c: Likewise.
* stdlib/labs.c: Likewise.
* stdlib/lcong48.c: Likewise.
* stdlib/lcong48_r.c: Likewise.
* stdlib/llabs.c: Likewise.
* stdlib/lrand48.c: Likewise.
* stdlib/lrand48_r.c: Likewise.
* stdlib/mblen.c: Likewise.
* stdlib/mbstowcs.c: Likewise.
* stdlib/mbtowc.c: Likewise.
* stdlib/mp_clz_tab.c: Likewise.
* stdlib/mrand48.c: Likewise.
* stdlib/mrand48_r.c: Likewise.
* stdlib/msort.c: Likewise.
* stdlib/nrand48.c: Likewise.
* stdlib/nrand48_r.c: Likewise.
* stdlib/qsort.c: Likewise.
* stdlib/rpmatch.c: Likewise.
* stdlib/seed48.c: Likewise.
* stdlib/seed48_r.c: Likewise.
* stdlib/srand48.c: Likewise.
* stdlib/srand48_r.c: Likewise.
* stdlib/strtod.c: Likewise.
* stdlib/wcstombs.c: Likewise.
* stdlib/wctomb.c: Likewise.
1997-02-05 05:08 Ulrich Drepper <drepper@cygnus.com>
* stdlib/mp_clz_tab.c (__clz_tab): Follow change in GMP and define
as const.
1997-02-04 23:57 Fila Kolodny <fila@ibi.com>
* sysdeps/unix/sysv/linux/socketbits.h: Define __need_NULL before
including <stddef.h>.
1997-02-03 20:01 H.J. Lu <hjl@gnu.ai.mit.edu>
* time/Makefile (tzbases, tzlinks): New.
(tzfiles): Changed to $(tzbases) $(tzlinks).
($(tzfiles:%=$(objpfx)z.%): Make $(tzlinks) depend on $(tzbases).
1997-02-02 12:13 H.J. Lu <hjl@gnu.ai.mit.edu>
* Makefile (install): Ignore error from ldconfig.
* time/zic.c (mkdirs): Double check the error return of mkdir ().
1997-02-04 22:01 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/vfprintf.c: Prepare to use __va_copy for architectures
like PPC where va_list is no integral type.
1997-02-04 15:27 Roma Ekzhanov <ekzhanov@paragraph.com>
* posix/getopt.c (exchange): Don't allocate nonoption_flags array
if nonoption_flags_len == -1.
Diffstat (limited to 'stdlib/qsort.c')
-rw-r--r-- | stdlib/qsort.c | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/stdlib/qsort.c b/stdlib/qsort.c index 0c83c48569..7e36ffea97 100644 --- a/stdlib/qsort.c +++ b/stdlib/qsort.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1996 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Douglas C. Schmidt (schmidt@ics.uci.edu). @@ -17,7 +17,6 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <ansidecl.h> #include <stdlib.h> #include <string.h> @@ -77,16 +76,18 @@ typedef struct stack size is needed (actually O(1) in this case)! */ void -DEFUN(_quicksort, (pbase, total_elems, size, cmp), - PTR CONST pbase AND size_t total_elems AND size_t size AND - int EXFUN((*cmp), (CONST PTR, CONST PTR))) +_quicksort (pbase, total_elems, size, cmp) + void *const pbase; + size_t total_elems; + size_t size; + int (*cmp) __P ((const void *, const void *)); { register char *base_ptr = (char *) pbase; /* Allocating SIZE bytes for a pivot buffer facilitates a better algorithm below since we can do comparisons directly on the pivot. */ char *pivot_buffer = (char *) __alloca (size); - CONST size_t max_thresh = MAX_THRESH * size; + const size_t max_thresh = MAX_THRESH * size; if (total_elems == 0) /* Avoid lossage with unsigned arithmetic below. */ @@ -114,16 +115,16 @@ DEFUN(_quicksort, (pbase, total_elems, size, cmp), char *mid = lo + size * ((hi - lo) / size >> 1); - if ((*cmp)((PTR) mid, (PTR) lo) < 0) - SWAP(mid, lo, size); - if ((*cmp)((PTR) hi, (PTR) mid) < 0) - SWAP(mid, hi, size); + if ((*cmp) ((void *) mid, (void *) lo) < 0) + SWAP (mid, lo, size); + if ((*cmp) ((void *) hi, (void *) mid) < 0) + SWAP (mid, hi, size); else goto jump_over; - if ((*cmp)((PTR) mid, (PTR) lo) < 0) - SWAP(mid, lo, size); + if ((*cmp) ((void *) mid, (void *) lo) < 0) + SWAP (mid, lo, size); jump_over:; - memcpy(pivot, mid, size); + memcpy (pivot, mid, size); pivot = pivot_buffer; left_ptr = lo + size; @@ -134,15 +135,15 @@ DEFUN(_quicksort, (pbase, total_elems, size, cmp), that this algorithm runs much faster than others. */ do { - while ((*cmp)((PTR) left_ptr, (PTR) pivot) < 0) + while ((*cmp) ((void *) left_ptr, (void *) pivot) < 0) left_ptr += size; - while ((*cmp)((PTR) pivot, (PTR) right_ptr) < 0) + while ((*cmp) ((void *) pivot, (void *) right_ptr) < 0) right_ptr -= size; if (left_ptr < right_ptr) { - SWAP(left_ptr, right_ptr, size); + SWAP (left_ptr, right_ptr, size); left_ptr += size; right_ptr -= size; } @@ -164,7 +165,7 @@ DEFUN(_quicksort, (pbase, total_elems, size, cmp), { if ((size_t) (hi - left_ptr) <= max_thresh) /* Ignore both small partitions. */ - POP(lo, hi); + POP (lo, hi); else /* Ignore small left partition. */ lo = left_ptr; @@ -175,13 +176,13 @@ DEFUN(_quicksort, (pbase, total_elems, size, cmp), else if ((right_ptr - lo) > (hi - left_ptr)) { /* Push larger left partition indices. */ - PUSH(lo, right_ptr); + PUSH (lo, right_ptr); lo = left_ptr; } else { /* Push larger right partition indices. */ - PUSH(left_ptr, hi); + PUSH (left_ptr, hi); hi = right_ptr; } } @@ -196,7 +197,7 @@ DEFUN(_quicksort, (pbase, total_elems, size, cmp), #define min(x, y) ((x) < (y) ? (x) : (y)) { - char *CONST end_ptr = &base_ptr[size * (total_elems - 1)]; + char *const end_ptr = &base_ptr[size * (total_elems - 1)]; char *tmp_ptr = base_ptr; char *thresh = min(end_ptr, base_ptr + max_thresh); register char *run_ptr; @@ -206,11 +207,11 @@ DEFUN(_quicksort, (pbase, total_elems, size, cmp), and the operation speeds up insertion sort's inner loop. */ for (run_ptr = tmp_ptr + size; run_ptr <= thresh; run_ptr += size) - if ((*cmp)((PTR) run_ptr, (PTR) tmp_ptr) < 0) + if ((*cmp) ((void *) run_ptr, (void *) tmp_ptr) < 0) tmp_ptr = run_ptr; if (tmp_ptr != base_ptr) - SWAP(tmp_ptr, base_ptr, size); + SWAP (tmp_ptr, base_ptr, size); /* Insertion sort, running from left-hand-side up to right-hand-side. */ @@ -218,7 +219,7 @@ DEFUN(_quicksort, (pbase, total_elems, size, cmp), while ((run_ptr += size) <= end_ptr) { tmp_ptr = run_ptr - size; - while ((*cmp)((PTR) run_ptr, (PTR) tmp_ptr) < 0) + while ((*cmp) ((void *) run_ptr, (void *) tmp_ptr) < 0) tmp_ptr -= size; tmp_ptr += size; |