large X (for version.sh)

[openldap] / include / lber.h

diff --git a/include/lber.h b/include/lber.h
index 6af661f1369457c4e2c84f2ef58d04acee772f29..ec1ec1bdda1633ba9f9296874b69f213395256ac 100644 (file)
--- a/include/lber.h
+++ b/include/lber.h
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -152,7 +152,7 @@ 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)
 
@@ -583,20 +583,24 @@ 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((
        LDAP_CONST char * ));
 
+LBER_F( struct berval * )
+ber_bvreplace LDAP_P((
+       struct berval *dst, LDAP_CONST struct berval *src ));
+
 LBER_F( void )
 ber_bvarray_free LDAP_P(( BerVarray p ));
 
@@ -618,6 +622,10 @@ LBER_F( int * ) ber_errno_addr LDAP_P((void));
 #define LBER_ERROR_PARAM       0x1
 #define LBER_ERROR_MEMORY      0x2
 
+#ifdef LDAP_DEVEL
+#define LDAP_NULL_IS_NULL
+#endif
+
 LDAP_END_DECL
 
 #endif /* _LBER_H */