cleanup old TOOLID macro

[openldap] / include / lber.h

diff --git a/include/lber.h b/include/lber.h
index c1d0d82a57ebd2aa52e24adcee54c2628d960732..515b45b19b929fc82c0205f4866cbe5424460b51 100644 (file)
--- a/include/lber.h
+++ b/include/lber.h
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -64,7 +64,7 @@ LDAP_BEGIN_DECL
  * as valid BER tags, and so it is safe to use them to report errors.  In
  * fact, any tag for which the following is true is invalid:
  */
-#define LBER_INVALID(t)     (((t) & (ber_tag_t) 0x080) \
+#define LBER_INVALID(t)     (((t) & (ber_tag_t) 0x080UL) \
        && (((t) & (ber_tag_t) ~ 0x0FF))
 
 #define LBER_ERROR                     ((ber_tag_t) -1)
@@ -88,7 +88,7 @@ typedef int (*BERTranslateProc) LDAP_P((
 /* LBER BerElement options */
 #define LBER_USE_DER           0x01
 #define LBER_USE_INDEFINITE_LEN        0x02
-#define LBER_TRANSLATE_STRINGS 0x04
+#define LBER_TRANSLATE_STRINGS 0x04    /* deprecated */
 
 /* get/set options for BerElement */
 #define LBER_OPT_BER_OPTIONS                   0x01
@@ -105,6 +105,7 @@ typedef int (*BERTranslateProc) LDAP_P((
 #define LBER_OPT_LOG_PRINT_FN  0x8001
 #define LBER_OPT_MEMORY_FNS            0x8002
 #define LBER_OPT_ERROR_FN              0x8003
+#define LBER_OPT_LOG_PRINT_FILE                0x8004
 
 typedef int* (*BER_ERRNO_FN) LDAP_P(( void ));
 
@@ -199,6 +200,11 @@ ber_get_int LDAP_P((
        BerElement *ber,
        ber_int_t *num ));
 
+LIBLBER_F( ber_tag_t )
+ber_get_enum LDAP_P((
+       BerElement *ber,
+       ber_int_t *num ));
+
 LIBLBER_F( ber_tag_t )
 ber_get_stringb LDAP_P((
        BerElement *ber,
@@ -466,10 +472,23 @@ LIBLBER_F( void )
 ber_bvecfree LDAP_P((
        struct berval **bv ));
 
+LIBLBER_F( int )
+ber_bvecadd LDAP_P((
+       struct berval ***bvec,
+       struct berval *bv ));
+
 LIBLBER_F( struct berval * )
 ber_bvdup LDAP_P((
        LDAP_CONST struct berval *bv ));
 
+LIBLBER_F( struct berval * )
+ber_bvstr LDAP_P((
+       LDAP_CONST char * ));
+
+LIBLBER_F( struct berval * )
+ber_bvstrdup LDAP_P((
+       LDAP_CONST char * ));
+
 LIBLBER_F( char * )
 ber_strdup LDAP_P((
        LDAP_CONST char * ));