Release 4.1

[unix-history] / usr / src / usr.bin / tn3270 / general / genbsubs.c

diff --git a/usr/src/usr.bin/tn3270/general/genbsubs.c b/usr/src/usr.bin/tn3270/general/genbsubs.c
index ad4b4de..4e4b3fe 100644 (file)
--- a/usr/src/usr.bin/tn3270/general/genbsubs.c
+++ b/usr/src/usr.bin/tn3270/general/genbsubs.c
@@ -1,27 +1,23 @@
 /*
 /*

- *     Copyright (c) 1984, 1985, 1986 by the Regents of the
- *     University of California and by Gregory Glenn Minshall.
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.

  *
  *

- *     Permission to use, copy, modify, and distribute these
- *     programs and their documentation for any purpose and
- *     without fee is hereby granted, provided that this
- *     copyright and permission appear on all copies and
- *     supporting documentation, the name of the Regents of
- *     the University of California not be used in advertising
- *     or publicity pertaining to distribution of the programs
- *     without specific prior permission, and notice be given in
- *     supporting documentation that copying and distribution is
- *     by permission of the Regents of the University of California
- *     and by Gregory Glenn Minshall.  Neither the Regents of the
- *     University of California nor Gregory Glenn Minshall make
- *     representations about the suitability of this software
- *     for any purpose.  It is provided "as is" without
- *     express or implied warranty.
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
  */
 

-#ifndef        lint
-static char    sccsid[] = "@(#)genbsubs.c      3.1  10/29/86";
-#endif /* ndef lint */
+#ifndef lint
+static char sccsid[] = "@(#)genbsubs.c 4.1 (Berkeley) %G%";
+#endif /* not lint */

 
 /* The output of bunequal is the offset of the byte which didn't match;
  * if all the bytes match, then we return n.
 
 /* The output of bunequal is the offset of the byte which didn't match;
  * if all the bytes match, then we return n.


@@ -63,35 +59,7 @@ register int b;
 }
 
 /*
 }
 
 /*

- * memNIchr(const void *s, int c, size_t n, int and)
- *
- * Like memchr, but the comparison is '((*s)&and) == c'.
- *
- */
-
-unsigned char *
-memNIchr(s, c, n, and)
-char *s;
-int c;
-unsigned int n;
-int and;
-{
-    register unsigned char _c, *_s, _and;
-
-    _and = and;
-    _c = (c&_and);
-    _s = (unsigned char *)s;
-    while (n--) {
-       if (((*_s)&_and) == _c) {
-           return _s;
-       }
-       _s++;
-    }
-    return 0;
-}
-
-/*
- * memNDchr(const void *s, int c, size_t n, int and)
+ * memNSchr(const void *s, int c, size_t n, int and)

  *
  * Like memchr, but the comparison is '((*s)&and) == c',
  * and we increment our way through s by "stride" ('s += stride').
  *
  * Like memchr, but the comparison is '((*s)&and) == c',
  * and we increment our way through s by "stride" ('s += stride').