Fix previous commit

[openldap] / include / lber.h

diff --git a/include/lber.h b/include/lber.h
index 327c40acb3c4f7690f6752be2626774f974198bc..ea24431fcc1e2933462b0c11b3324bc1f9d7c05f 100644 (file)
--- a/include/lber.h
+++ b/include/lber.h
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -132,8 +132,8 @@ typedef struct lber_memory_fns {
 #define LBER_SB_OPT_DRAIN              10
 #define LBER_SB_OPT_NEEDS_READ         11
 #define LBER_SB_OPT_NEEDS_WRITE                12
-#define LBER_SB_OPT_GET_MAX_INCOMING 13
-#define LBER_SB_OPT_SET_MAX_INCOMING 14
+#define LBER_SB_OPT_GET_MAX_INCOMING   13
+#define LBER_SB_OPT_SET_MAX_INCOMING   14
 /* Largest option used by the library */
 #define LBER_SB_OPT_OPT_MAX            14
 
@@ -154,6 +154,7 @@ typedef struct lber_memory_fns {
 #define LBER_OPT_SUCCESS       (0)
 #define LBER_OPT_ERROR         (-1)
 
+#define LBER_ELEMENT_SIZEOF (256) /* must be >= sizeof(BerElement) */
 typedef struct berelement BerElement;
 typedef struct sockbuf Sockbuf;
 typedef struct seqorset Seqorset;
@@ -201,6 +202,8 @@ typedef struct berval {
        char            *bv_val;
 } BerValue;
 
+typedef BerValue *BerVarray;   /* To distinguish from a single bv */
+
 /* this should be moved to lber-int.h */
 
 /*
@@ -260,6 +263,12 @@ ber_get_stringb LDAP_P((
        char *buf,
        ber_len_t *len ));
 
+LBER_F( ber_tag_t )
+ber_get_stringbv LDAP_P((
+       BerElement *ber,
+       struct berval *bv,
+       int alloc ));
+
 LBER_F( ber_tag_t )
 ber_get_stringa LDAP_P((
        BerElement *ber,
@@ -332,7 +341,7 @@ ber_put_ostring LDAP_P((
 LBER_F( int )
 ber_put_berval LDAP_P((
        BerElement *ber,
-       LDAP_CONST struct berval *bv,
+       struct berval *bv,
        ber_tag_t tag ));
 
 LBER_F( int )
@@ -406,6 +415,9 @@ ber_free LDAP_P((
        BerElement *ber,
        int freebuf ));
 
+LBER_F( void )
+ber_free_buf LDAP_P(( BerElement *ber ));
+
 LBER_F( int )
 ber_flush LDAP_P((
        Sockbuf *sb,
@@ -432,6 +444,12 @@ ber_get_next LDAP_P((
        ber_len_t *len,
        BerElement *ber ));
 
+LBER_F( void )
+ber_init2 LDAP_P((
+       BerElement *ber,
+       struct berval *bv,
+       int options ));
+
 LBER_F( void )
 ber_init_w_nullc LDAP_P((      /* DEPRECATED */
        BerElement *ber,
@@ -451,6 +469,12 @@ ber_flatten LDAP_P((
        BerElement *ber,
        struct berval **bvPtr ));
 
+LBER_F( int )
+ber_flatten2 LDAP_P((
+       BerElement *ber,
+       struct berval *bv,
+       int alloc ));
+
 /*
  * LBER ber accessor functions
  */
@@ -544,22 +568,40 @@ ber_bvecadd LDAP_P((
        struct berval ***bvec,
        struct berval *bv ));
 
+LBER_F( struct berval * )
+ber_dupbv LDAP_P((
+       struct berval *dst, struct berval *src ));
+
 LBER_F( struct berval * )
 ber_bvdup LDAP_P((
-       LDAP_CONST struct berval *bv ));
+       struct berval *src ));
 
 LBER_F( struct berval * )
-ber_bvstr LDAP_P((
-       LDAP_CONST char * ));
+ber_str2bv LDAP_P((
+       LDAP_CONST char *, ber_len_t len, int dup, struct berval *bv));
 
 LBER_F( struct berval * )
-ber_bvstrdup LDAP_P((
-       LDAP_CONST char * ));
+ber_mem2bv LDAP_P((
+       LDAP_CONST char *, ber_len_t len, int dup, struct berval *bv));
+
+#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( void )
+ber_bvarray_free LDAP_P(( BerVarray p ));
+
+LBER_F( int )
+ber_bvarray_add LDAP_P(( BerVarray *p, BerValue *bv ));
+
+#define ber_bvcmp(v1,v2) \
+       ((v1)->bv_len < (v2)->bv_len \
+               ? -1 : ((v1)->bv_len > (v2)->bv_len \
+                       ? 1 : memcmp((v1)->bv_val, (v2)->bv_val, (v1)->bv_len) ))
+
 /*
  * error.c
  */