BSD 4_3_Net_2 release

[unix-history] / usr / src / lib / libc / stdlib / bsearch.c

diff --git a/usr/src/lib/libc/stdlib/bsearch.c b/usr/src/lib/libc/stdlib/bsearch.c
index 18f4f5a..ca7ffe6 100644 (file)
--- a/usr/src/lib/libc/stdlib/bsearch.c
+++ b/usr/src/lib/libc/stdlib/bsearch.c
@@ -2,23 +2,37 @@
  * Copyright (c) 1990 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1990 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)bsearch.c  5.3 (Berkeley) 5/17/90";
+static char sccsid[] = "@(#)bsearch.c  5.4 (Berkeley) 2/23/91";

 #endif /* LIBC_SCCS and not lint */
 
 #include <stddef.h>            /* size_t */
 #endif /* LIBC_SCCS and not lint */
 
 #include <stddef.h>            /* size_t */


@@ -42,21 +56,21 @@ static char sccsid[] = "@(#)bsearch.c       5.3 (Berkeley) 5/17/90";
  */
 void *
 bsearch(key, base0, nmemb, size, compar)
  */
 void *
 bsearch(key, base0, nmemb, size, compar)

-       register void *key;
-       void *base0;
+       register const void *key;
+       const void *base0;

        size_t nmemb;
        register size_t size;
        size_t nmemb;
        register size_t size;

-       register int (*compar)();
+       register int (*compar) __P((const void *, const void *));

 {
 {

-       register char *base = base0;
+       register const char *base = base0;

        register int lim, cmp;
        register int lim, cmp;

-       register void *p;
+       register const void *p;

 
        for (lim = nmemb; lim != 0; lim >>= 1) {
                p = base + (lim >> 1) * size;
                cmp = (*compar)(key, p);
                if (cmp == 0)
 
        for (lim = nmemb; lim != 0; lim >>= 1) {
                p = base + (lim >> 1) * size;
                cmp = (*compar)(key, p);
                if (cmp == 0)

-                       return (p);
+                       return ((void *)p);

                if (cmp > 0) {  /* key > p: move right */
                        base = (char *)p + size;
                        lim--;
                if (cmp > 0) {  /* key > p: move right */
                        base = (char *)p + size;
                        lim--;