386BSD 0.1 development

[unix-history] / usr / src / include / bitstring.h

diff --git a/usr/src/include/bitstring.h b/usr/src/include/bitstring.h
index 1feff43..21f10f6 100644 (file)
--- a/usr/src/include/bitstring.h
+++ b/usr/src/include/bitstring.h
@@ -5,21 +5,40 @@
  * This code is derived from software contributed to Berkeley by
  * Paul Vixie.
  *
  * This code is derived from software contributed to Berkeley by
  * Paul Vixie.
  *

- * 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 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.

  *
  *

- *     @(#)bitstring.h 5.2 (Berkeley) %G%
+ * 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.
+ *
+ *     @(#)bitstring.h 5.5 (Berkeley) 4/3/91

  */
 
  */
 

+#ifndef _BITSTRING_H_
+#define        _BITSTRING_H_
+

 typedef        unsigned char bitstr_t;
 
 /* internal macros */
 typedef        unsigned char bitstr_t;
 
 /* internal macros */


@@ -38,7 +57,7 @@ typedef       unsigned char bitstr_t;
 
                                /* allocate a bitstring */
 #define        bit_alloc(nbits) \
 
                                /* allocate a bitstring */
 #define        bit_alloc(nbits) \

-       (bitstr_t *)malloc(1, \
+       (bitstr_t *)calloc(1, \

            (unsigned int)_bitstr_size(nbits) * sizeof(bitstr_t))
 
                                /* allocate a bitstring on the stack */
            (unsigned int)_bitstr_size(nbits) * sizeof(bitstr_t))
 
                                /* allocate a bitstring on the stack */


@@ -110,3 +129,5 @@ typedef     unsigned char bitstr_t;
                } \
        *(value) = _value; \
 }
                } \
        *(value) = _value; \
 }

+
+#endif /* !_BITSTRING_H_ */