Fixing bug in extensible filter indexing

[openldap] / include / lber_pvt.h

diff --git a/include/lber_pvt.h b/include/lber_pvt.h
index e66f25533b37d326d77d5ca5ccad6ab1a3433b97..0afea13fa17c03363a07dcc2260b67fe4158e973 100644 (file)
--- a/include/lber_pvt.h
+++ b/include/lber_pvt.h
@@ -165,19 +165,20 @@ ber_bvarray_add_x LDAP_P(( BerVarray *p, BerValue *bv, void *ctx ));
 #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 }
-
-#define BER_BVZERO(bv) do { \
+#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 = sizeof(s)-1; \
+#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)
+#define BER_BVISNULL(bv)       ((bv)->bv_val == NULL)
+#define BER_BVISEMPTY(bv)      ((bv)->bv_len == 0)
 
 LDAP_END_DECL