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

version 1.22.2.5, 2004/04/11 16:57:42 version 1.35, 2006/01/03 22:12:05
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/include/lber_pvt.h,v 1.22.2.4 2004/01/01 18:16:28 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/include/lber_pvt.h,v 1.34 2005/11/14 14:41:08 hallvard 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-2004 The OpenLDAP Foundation.   * Copyright 1998-2006 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 135  LBER_F( char * ) Line 135  LBER_F( char * )
 ber_strdup_x LDAP_P((  ber_strdup_x LDAP_P((
         LDAP_CONST char *, void *ctx ));          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 )  LBER_F( void )
 ber_bvarray_free_x LDAP_P(( BerVarray p, void *ctx ));  ber_bvarray_free_x LDAP_P(( BerVarray p, void *ctx ));
   
Line 163  ber_bvarray_add_x LDAP_P(( BerVarray *p, Line 167  ber_bvarray_add_x LDAP_P(( BerVarray *p,
         ( (s)[0] == (c) && (s)[1] == '\0' )          ( (s)[0] == (c) && (s)[1] == '\0' )
   
 #define ber_bvchr(bv,c) \  #define ber_bvchr(bv,c) \
         memchr( (bv)->bv_val, (c), (bv)->bv_len )          ((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_right(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_left(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_right(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_left(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)              { sizeof(s) - 1, (s) }  #define BER_BVC(s)              { STRLENOF(s), (s) }
 #define BER_BVNULL              { 0L, NULL }  #define BER_BVNULL              { 0L, NULL }
 #define BER_BVZERO(bv) \  #define BER_BVZERO(bv) \
         do { \          do { \
Line 174  ber_bvarray_add_x LDAP_P(( BerVarray *p, Line 207  ber_bvarray_add_x LDAP_P(( BerVarray *p,
         } while (0)          } while (0)
 #define BER_BVSTR(bv,s) \  #define BER_BVSTR(bv,s) \
         do { \          do { \
                 (bv)->bv_len = sizeof(s)-1; \                  (bv)->bv_len = STRLENOF(s); \
                 (bv)->bv_val = (s); \                  (bv)->bv_val = (s); \
         } while (0)          } while (0)
 #define BER_BVISNULL(bv)        ((bv)->bv_val == NULL)  #define BER_BVISNULL(bv)        ((bv)->bv_val == NULL)

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


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