X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Flber.h;h=5fb2c8a9ee73e247d21d954ab27ab758ec039021;hb=53d6d3c95755e16b1b9240c1fd928bb6fc8deab1;hp=c01b3acc04f59ac2ff4412317ea0a910e6e3050f;hpb=0f29f0af965358fc71d9f015376c2b51e04d03be;p=openldap
diff --git a/include/lber.h b/include/lber.h
index c01b3acc04..5fb2c8a9ee 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-2007 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,14 +152,13 @@ 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)
#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;
@@ -421,10 +423,20 @@ LBER_F( void )
ber_free_buf LDAP_P(( BerElement *ber ));
LBER_F( int )
-ber_flush LDAP_P((
+ber_flush2 LDAP_P((
Sockbuf *sb,
BerElement *ber,
int freeit ));
+#define LBER_FLUSH_FREE_NEVER (0x0) /* traditional behavior */
+#define LBER_FLUSH_FREE_ON_SUCCESS (0x1) /* traditional behavior */
+#define LBER_FLUSH_FREE_ON_ERROR (0x2)
+#define LBER_FLUSH_FREE_ALWAYS (LBER_FLUSH_FREE_ON_SUCCESS|LBER_FLUSH_FREE_ON_ERROR)
+
+LBER_F( int )
+ber_flush LDAP_P((
+ Sockbuf *sb,
+ BerElement *ber,
+ int freeit )); /* DEPRECATED */
LBER_F( BerElement * )
ber_alloc LDAP_P(( void )); /* DEPRECATED */
@@ -532,9 +544,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
@@ -583,20 +593,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 ));