X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Flber.h;h=93eebc3e486495895ddc3e0c5aca34baab5ca57d;hb=7674aa817fe673676bc90436ee2daa89c74930c3;hp=20095179a61726c01191697d43243d06e058f109;hpb=4f58efc4d1ba7622b81c0bac50fbb674566f268a;p=openldap
diff --git a/include/lber.h b/include/lber.h
index 20095179a6..93eebc3e48 100644
--- 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 .
+ *
+ * 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
+ * .
*/
-/* 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
@@ -25,6 +27,7 @@
#define _LBER_H
#include
+#include
LDAP_BEGIN_DECL
@@ -149,13 +152,13 @@ typedef struct lber_memory_fns {
#define LBER_OPT_SOCKBUF_DEBUG 0x1002
/* on/off values */
-#define LBER_OPT_ON ((void *) 1)
+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 struct berelement BerElement;
typedef struct sockbuf Sockbuf;
typedef struct seqorset Seqorset;
@@ -531,9 +534,7 @@ LBER_V( Sockbuf_IO ) ber_sockbuf_io_tcp;
LBER_V( Sockbuf_IO ) ber_sockbuf_io_readahead;
LBER_V( Sockbuf_IO ) ber_sockbuf_io_fd;
LBER_V( Sockbuf_IO ) ber_sockbuf_io_debug;
-#ifdef LDAP_CONNECTIONLESS
LBER_V( Sockbuf_IO ) ber_sockbuf_io_udp;
-#endif
/*
* LBER memory.c
@@ -582,82 +583,29 @@ 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( 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 ));
+ber_bvreplace LDAP_P((
+ struct berval *dst, LDAP_CONST struct berval *src ));
LBER_F( void )
-ber_bvarray_free_x LDAP_P(( BerVarray p, void *ctx ));
+ber_bvarray_free LDAP_P(( BerVarray p ));
LBER_F( int )
-ber_bvarray_add_x LDAP_P(( BerVarray *p, BerValue *bv, void *ctx ));
+ber_bvarray_add LDAP_P(( BerVarray *p, BerValue *bv ));
#define ber_bvcmp(v1,v2) \
((v1)->bv_len < (v2)->bv_len \