Diff for /include/lber_pvt.h between versions 1.35 and 1.42

version 1.35, 2006/01/03 22:12:05 version 1.42, 2009/11/20 19:43:50
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/include/lber_pvt.h,v 1.34 2005/11/14 14:41:08 hallvard Exp $ */  /* $OpenLDAP: pkg/ldap/include/lber_pvt.h,v 1.41 2009/01/21 23:40:18 kurt Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *   *
  * Copyright 1998-2006 The OpenLDAP Foundation.   * Copyright 1998-2009 The OpenLDAP Foundation.
  * All rights reserved.   * All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
Line 145  ber_bvarray_free_x LDAP_P(( BerVarray p, Line 145  ber_bvarray_free_x LDAP_P(( BerVarray p,
 LBER_F( int )  LBER_F( int )
 ber_bvarray_add_x LDAP_P(( BerVarray *p, BerValue *bv, void *ctx ));  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  #if 0
 #define ber_bvstrcmp(v1,v2) \  #define ber_bvstrcmp(v1,v2) \
         ((v1)->bv_len < (v2)->bv_len \          ((v1)->bv_len < (v2)->bv_len \
Line 170  ber_bvarray_add_x LDAP_P(( BerVarray *p, Line 173  ber_bvarray_add_x LDAP_P(( BerVarray *p,
         ((char *) memchr( (bv)->bv_val, (c), (bv)->bv_len ))          ((char *) memchr( (bv)->bv_val, (c), (bv)->bv_len ))
   
 #define ber_bvrchr(bv,c) \  #define ber_bvrchr(bv,c) \
         ((char *) memrchr( (bv)->bv_val, (c), (bv)->bv_len ))          ((char *) lutil_memrchr( (bv)->bv_val, (c), (bv)->bv_len ))
   
 #define ber_bvchr_right(dst,bv,c) \  #define ber_bvchr_post(dst,bv,c) \
         do { \          do { \
                 (dst)->bv_val = memchr( (bv)->bv_val, (c), (bv)->bv_len ); \                  (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; \                  (dst)->bv_len = (dst)->bv_val ? (bv)->bv_len - ((dst)->bv_val - (bv)->bv_val) : 0; \
         } while (0)          } while (0)
   
 #define ber_bvchr_left(dst,bv,c) \  #define ber_bvchr_pre(dst,bv,c) \
         do { \          do { \
                 (dst)->bv_val = memchr( (bv)->bv_val, (c), (bv)->bv_len ); \                  (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_len = (dst)->bv_val ? ((dst)->bv_val - (bv)->bv_val) : (bv)->bv_len; \
                 (dst)->bv_val = (bv)->bv_val; \                  (dst)->bv_val = (bv)->bv_val; \
         } while (0)          } while (0)
   
 #define ber_bvrchr_right(dst,bv,c) \  #define ber_bvrchr_post(dst,bv,c) \
         do { \          do { \
                 (dst)->bv_val = memrchr( (bv)->bv_val, (c), (bv)->bv_len ); \                  (dst)->bv_val = lutil_memrchr( (bv)->bv_val, (c), (bv)->bv_len ); \
                 (dst)->bv_len = (dst)->bv_val ? (bv)->bv_len - ((dst)->bv_val - (bv)->bv_val) : 0; \                  (dst)->bv_len = (dst)->bv_val ? (bv)->bv_len - ((dst)->bv_val - (bv)->bv_val) : 0; \
         } while (0)          } while (0)
   
 #define ber_bvrchr_left(dst,bv,c) \  #define ber_bvrchr_pre(dst,bv,c) \
         do { \          do { \
                 (dst)->bv_val = memrchr( (bv)->bv_val, (c), (bv)->bv_len ); \                  (dst)->bv_val = lutil_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_len = (dst)->bv_val ? ((dst)->bv_val - (bv)->bv_val) : (bv)->bv_len; \
                 (dst)->bv_val = (bv)->bv_val; \                  (dst)->bv_val = (bv)->bv_val; \
         } while (0)          } while (0)
   
 #define BER_BVC(s)              { STRLENOF(s), (s) }  #define BER_BVC(s)              { STRLENOF(s), (char *)(s) }
 #define BER_BVNULL              { 0L, NULL }  #define BER_BVNULL              { 0L, NULL }
 #define BER_BVZERO(bv) \  #define BER_BVZERO(bv) \
         do { \          do { \

Removed from v.1.35  
changed lines
  Added in v.1.42


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org