Cleanup NT service support declarations

[openldap] / include / lber.h

diff --git a/include/lber.h b/include/lber.h
index 80da3f19d31f85f68dfb6b64e7c06a600ce95a70..ea24431fcc1e2933462b0c11b3324bc1f9d7c05f 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
@@ -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;
@@ -443,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,
@@ -462,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
  */
@@ -567,6 +580,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)
 
@@ -580,23 +597,10 @@ ber_bvarray_free LDAP_P(( BerVarray p ));
 LBER_F( int )
 ber_bvarray_add LDAP_P(( BerVarray *p, BerValue *bv ));
 
-#define ber_memcmp(v1,v2) \
-       ((v1)->bv_len == (v2)->bv_len ? \
-               memcmp((v1)->bv_val, (v2)->bv_val, (v1)->bv_len) : \
-               (v1)->bv_len - (v2)->bv_len )
-       
-#define ber_cmp(v1,v2) \
-       ((v1)->bv_len == (v2)->bv_len ? \
-               strcmp((v1)->bv_val, (v2)->bv_val) : \
-               (v1)->bv_len - (v2)->bv_len )
-
-#define ber_casecmp(v1,v2) \
-       ((v1)->bv_len == (v2)->bv_len ? \
-               strcasecmp((v1)->bv_val, (v2)->bv_val) : \
-               (v1)->bv_len - (v2)->bv_len )
-
-#define ber_charcmp(v1,c) \
-       ((v1)->bv_len == 1 ? (v1)->bv_val[0] == c : 0)
+#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