ITS#4052,4053 plug mem leaks

[openldap] / include / lber.h

diff --git a/include/lber.h b/include/lber.h
index 3b351c5818d64270f4352a74f0197fa9b6b9657f..c3c0da6485cabd1187b6984c22e9b0d6198ae4db 100644 (file)
--- a/include/lber.h
+++ b/include/lber.h
@@ -1,16 +1,18 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted only as authorized by the OpenLDAP
- * Public License.  A copy of this license is available at
- * http://www.OpenLDAP.org/license.html or in file LICENSE in the
- * top-level directory of the distribution.
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-/* Portions
- * Copyright (c) 1990 Regents of the University of Michigan.
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -150,25 +152,13 @@ typedef struct lber_memory_fns {
 #define LBER_OPT_SOCKBUF_DEBUG         0x1002
 
 /* on/off values */
-extern char ber_pvt_opt_on;
+LBER_V( char ) ber_pvt_opt_on;
 #define LBER_OPT_ON            ((void *) &ber_pvt_opt_on)
 #define LBER_OPT_OFF   ((void *) 0)
 
 #define LBER_OPT_SUCCESS       (0)
 #define LBER_OPT_ERROR         (-1)
 
-#define LBER_ELEMENT_SIZEOF (256) /* must be >= sizeof(BerElement) */
-typedef union ber_buffer_u {
-       char charbuf[LBER_ELEMENT_SIZEOF];
-
-       /* force alignment */
-       int intbuf;
-       long longbuf;
-       float floatbuf;
-       double doublebuf;
-       char* ptrbuf;
-} BerElementBuffer;
-
 typedef struct berelement BerElement;
 typedef struct sockbuf Sockbuf;
 typedef struct seqorset Seqorset;
@@ -593,15 +583,15 @@ ber_bvdup LDAP_P((
        struct berval *src ));
 
 LBER_F( struct berval * )
-ber_str2bv LDAP_P((
-       LDAP_CONST char *, ber_len_t len, int dup, struct berval *bv));
+ber_mem2bv LDAP_P((
+       LDAP_CONST char *, ber_len_t len, int duplicate, struct berval *bv));
 
 LBER_F( struct berval * )
-ber_mem2bv LDAP_P((
-       LDAP_CONST char *, ber_len_t len, int dup, struct berval *bv));
+ber_str2bv LDAP_P((
+       LDAP_CONST char *, ber_len_t len, int duplicate, struct berval *bv));
 
-#define        ber_bvstr(a)    ber_str2bv(a, 0, 0, NULL)
-#define        ber_bvstrdup(a) ber_str2bv(a, 0, 1, NULL)
+#define        ber_bvstr(a)    ((ber_str2bv)((a), 0, 0, NULL))
+#define        ber_bvstrdup(a) ((ber_str2bv)((a), 0, 1, NULL))
 
 LBER_F( char * )
 ber_strdup LDAP_P((