this should never occur, but in case keep it readable

[openldap] / include / lber_pvt.h

diff --git a/include/lber_pvt.h b/include/lber_pvt.h
index 48817d1b01441e5b5a47a4dc71a1f08bde4e323c..f0659a685720386e5a9179c7739ad93cdea49a7c 100644 (file)
--- a/include/lber_pvt.h
+++ b/include/lber_pvt.h
@@ -1,17 +1,21 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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
+ * <http://www.OpenLDAP.org/license.html>.
  */
+
 /*
- * lber_pvt.h - Header for ber_pvt_ functions. These are meant to be used
- *             by the OpenLDAP distribution only.
+ * lber_pvt.h - Header for ber_pvt_ functions. 
+ * These are meant to be internal to OpenLDAP Software.
  */
 
 #ifndef _LBER_PVT_H
@@ -21,6 +25,22 @@
 
 LDAP_BEGIN_DECL
 
+/* for allocating aligned buffers (on the stack) */
+#define LBER_ALIGNED_BUFFER(uname,size) \
+       union uname { \
+               char buffer[size]; \
+               /* force alignment */ \
+               int ialign; \
+               long lalign; \
+               float falign; \
+               double dalign; \
+               char* palign; \
+       }
+
+#define LBER_ELEMENT_SIZEOF (256) /* must be >= sizeof(BerElement) */
+typedef LBER_ALIGNED_BUFFER(lber_berelement_u,LBER_ELEMENT_SIZEOF)
+       BerElementBuffer;
+
 typedef struct sockbuf_buf {
        ber_len_t               buf_size;
        ber_len_t               buf_ptr;
@@ -115,12 +135,19 @@ LBER_F( char * )
 ber_strdup_x LDAP_P((
        LDAP_CONST char *, void *ctx ));
 
+LBER_F( struct berval * )
+ber_bvreplace_x LDAP_P((
+       struct berval *dst, LDAP_CONST struct berval *src, 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 ));
 
+LBER_F( int )
+ber_bvarray_dup_x LDAP_P(( BerVarray *dst, BerVarray src, void *ctx ));
+
 #if 0
 #define ber_bvstrcmp(v1,v2) \
        ((v1)->bv_len < (v2)->bv_len \
@@ -143,10 +170,51 @@ ber_bvarray_add_x LDAP_P(( BerVarray *p, BerValue *bv, void *ctx ));
        ( (s)[0] == (c) && (s)[1] == '\0' )
 
 #define ber_bvchr(bv,c) \
-       memchr( (bv)->bv_val, (c), (bv)->bv_len )
-
-#define BER_BVC(x)     { sizeof( (x) ) - 1, (x) }
-#define BER_BVNULL     { 0L, NULL }
+       ((char *) memchr( (bv)->bv_val, (c), (bv)->bv_len ))
+
+#define ber_bvrchr(bv,c) \
+       ((char *) memrchr( (bv)->bv_val, (c), (bv)->bv_len ))
+
+#define ber_bvchr_post(dst,bv,c) \
+       do { \
+               (dst)->bv_val = memchr( (bv)->bv_val, (c), (bv)->bv_len ); \
+               (dst)->bv_len = (dst)->bv_val ? (bv)->bv_len - ((dst)->bv_val - (bv)->bv_val) : 0; \
+       } while (0)
+
+#define ber_bvchr_pre(dst,bv,c) \
+       do { \
+               (dst)->bv_val = memchr( (bv)->bv_val, (c), (bv)->bv_len ); \
+               (dst)->bv_len = (dst)->bv_val ? ((dst)->bv_val - (bv)->bv_val) : (bv)->bv_len; \
+               (dst)->bv_val = (bv)->bv_val; \
+       } while (0)
+
+#define ber_bvrchr_post(dst,bv,c) \
+       do { \
+               (dst)->bv_val = memrchr( (bv)->bv_val, (c), (bv)->bv_len ); \
+               (dst)->bv_len = (dst)->bv_val ? (bv)->bv_len - ((dst)->bv_val - (bv)->bv_val) : 0; \
+       } while (0)
+
+#define ber_bvrchr_pre(dst,bv,c) \
+       do { \
+               (dst)->bv_val = memrchr( (bv)->bv_val, (c), (bv)->bv_len ); \
+               (dst)->bv_len = (dst)->bv_val ? ((dst)->bv_val - (bv)->bv_val) : (bv)->bv_len; \
+               (dst)->bv_val = (bv)->bv_val; \
+       } while (0)
+
+#define BER_BVC(s)             { STRLENOF(s), (s) }
+#define BER_BVNULL             { 0L, NULL }
+#define BER_BVZERO(bv) \
+       do { \
+               (bv)->bv_len = 0; \
+               (bv)->bv_val = NULL; \
+       } while (0)
+#define BER_BVSTR(bv,s)        \
+       do { \
+               (bv)->bv_len = STRLENOF(s); \
+               (bv)->bv_val = (s); \
+       } while (0)
+#define BER_BVISNULL(bv)       ((bv)->bv_val == NULL)
+#define BER_BVISEMPTY(bv)      ((bv)->bv_len == 0)
 
 LDAP_END_DECL