subtreeSpecification syntax change : -binary +validator

[openldap] / include / lber.h

diff --git a/include/lber.h b/include/lber.h
index 07f6cdc7f29670d625942fa9f18f1cdc6a10738a..87b01d07b1216e681d114f22399222f2b318a22e 100644 (file)
--- a/include/lber.h
+++ b/include/lber.h
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 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
@@ -90,6 +90,7 @@ LDAP_BEGIN_DECL
 #define LBER_OPT_BER_REMAINING_BYTES   0x03
 #define LBER_OPT_BER_TOTAL_BYTES               0x04
 #define LBER_OPT_BER_BYTES_TO_WRITE            0x05
+#define LBER_OPT_BER_MEMCTX                            0x06
 
 #define LBER_OPT_DEBUG_LEVEL   LBER_OPT_BER_DEBUG
 #define LBER_OPT_REMAINING_BYTES       LBER_OPT_BER_REMAINING_BYTES
@@ -109,16 +110,16 @@ typedef int* (*BER_ERRNO_FN) LDAP_P(( void ));
 
 typedef void (*BER_LOG_PRINT_FN) LDAP_P(( LDAP_CONST char *buf ));
 
-typedef void* (*BER_MEMALLOC_FN)       LDAP_P(( ber_len_t size ));
-typedef void* (*BER_MEMCALLOC_FN)      LDAP_P(( ber_len_t n, ber_len_t size ));
-typedef void* (*BER_MEMREALLOC_FN)     LDAP_P(( void *p, ber_len_t size ));
-typedef void  (*BER_MEMFREE_FN)                LDAP_P(( void *p ));
+typedef void* (BER_MEMALLOC_FN)        LDAP_P(( ber_len_t size, void *ctx ));
+typedef void* (BER_MEMCALLOC_FN)       LDAP_P(( ber_len_t n, ber_len_t size, void *ctx ));
+typedef void* (BER_MEMREALLOC_FN)      LDAP_P(( void *p, ber_len_t size, void *ctx ));
+typedef void  (BER_MEMFREE_FN)         LDAP_P(( void *p, void *ctx ));
 
 typedef struct lber_memory_fns {
-       BER_MEMALLOC_FN bmf_malloc;
-       BER_MEMCALLOC_FN bmf_calloc;
-       BER_MEMREALLOC_FN bmf_realloc;
-       BER_MEMFREE_FN bmf_free;
+       BER_MEMALLOC_FN *bmf_malloc;
+       BER_MEMCALLOC_FN *bmf_calloc;
+       BER_MEMREALLOC_FN *bmf_realloc;
+       BER_MEMFREE_FN *bmf_free;
 } BerMemoryFunctions;
 
 /* LBER Sockbuf_IO options */
@@ -154,6 +155,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,7 +203,7 @@ typedef struct berval {
        char            *bv_val;
 } BerValue;
 
-typedef BerValue *BVarray;     /* To distinguish from a single bv */
+typedef BerValue *BerVarray;   /* To distinguish from a single bv */
 
 /* this should be moved to lber-int.h */
 
@@ -265,7 +267,8 @@ ber_get_stringb LDAP_P((
 LBER_F( ber_tag_t )
 ber_get_stringbv LDAP_P((
        BerElement *ber,
-       struct berval *bv ));
+       struct berval *bv,
+       int alloc ));
 
 LBER_F( ber_tag_t )
 ber_get_stringa LDAP_P((
@@ -442,6 +445,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,
@@ -461,6 +470,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
  */
@@ -566,6 +581,10 @@ LBER_F( struct berval * )
 ber_str2bv LDAP_P((
        LDAP_CONST char *, ber_len_t len, int dup, struct berval *bv));
 
+LBER_F( struct berval * )
+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)
 
@@ -573,6 +592,74 @@ 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 ));
+
+LBER_F( void * )
+ber_memalloc_x LDAP_P((
+       ber_len_t s, void *ctx));
+
+LBER_F( void * )
+ber_memrealloc_x LDAP_P((
+       void* p,
+       ber_len_t s, void *ctx ));
+
+LBER_F( void * )
+ber_memcalloc_x LDAP_P((
+       ber_len_t n,
+       ber_len_t s, void *ctx ));
+
+LBER_F( void )
+ber_memfree_x LDAP_P((
+       void* p, void *ctx ));
+
+LBER_F( void )
+ber_memvfree_x LDAP_P((
+       void** vector, void *ctx ));
+
+LBER_F( void )
+ber_bvfree_x LDAP_P((
+       struct berval *bv, void *ctx ));
+
+LBER_F( void )
+ber_bvecfree_x LDAP_P((
+       struct berval **bv, void *ctx ));
+
+LBER_F( int )
+ber_bvecadd_x LDAP_P((
+       struct berval ***bvec,
+       struct berval *bv, void *ctx ));
+
+LBER_F( struct berval * )
+ber_dupbv_x LDAP_P((
+       struct berval *dst, struct berval *src, void *ctx ));
+
+LBER_F( struct berval * )
+ber_str2bv_x LDAP_P((
+       LDAP_CONST char *, ber_len_t len, int dup, struct berval *bv, void *ctx));
+
+LBER_F( struct berval * )
+ber_mem2bv_x LDAP_P((
+       LDAP_CONST char *, ber_len_t len, int dup, struct berval *bv, void *ctx));
+
+LBER_F( char * )
+ber_strdup_x LDAP_P((
+       LDAP_CONST char *, void *ctx ));
+
+LBER_F( void )
+ber_bvarray_free_x LDAP_P(( BerVarray p, void *ctx ));
+
+LBER_F( int )
+ber_bvarray_add_x LDAP_P(( BerVarray *p, BerValue *bv, void *ctx ));
+
+#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
  */