Diff for /libraries/liblber/lber-int.h between versions 1.61 and 1.62

version 1.61, 2003/04/09 07:41:03 version 1.62, 2003/04/09 11:25:11
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/libraries/liblber/lber-int.h,v 1.60 2003/01/03 19:20:51 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/libraries/liblber/lber-int.h,v 1.61 2003/04/09 07:41:03 hyc Exp $ */
 /*  /*
  * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.   * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file   * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
Line 84  struct berelement { Line 84  struct berelement {
   
         struct seqorset *ber_sos;          struct seqorset *ber_sos;
         char            *ber_rwptr;          char            *ber_rwptr;
           void            *ber_memctx;
 };  };
 #define LBER_VALID(ber) ((ber)->ber_valid==LBER_VALID_BERELEMENT)  #define LBER_VALID(ber) ((ber)->ber_valid==LBER_VALID_BERELEMENT)
   
Line 169  LBER_V (FILE *) ber_pvt_err_file; Line 170  LBER_V (FILE *) ber_pvt_err_file;
         /* simple macros to realloc for now */          /* simple macros to realloc for now */
 LBER_V (BerMemoryFunctions *)   ber_int_memory_fns;  LBER_V (BerMemoryFunctions *)   ber_int_memory_fns;
 LBER_F (char *) ber_strndup( LDAP_CONST char *, ber_len_t );  LBER_F (char *) ber_strndup( LDAP_CONST char *, ber_len_t );
 LBER_F (char *) ber_strndup__( LDAP_CONST char *, size_t );  LBER_F (char *) ber_strndup_x( LDAP_CONST char *, ber_len_t, void *ctx );
   
 #ifdef CSRIMALLOC  
 #define LBER_MALLOC                     malloc  
 #define LBER_CALLOC                     calloc  
 #define LBER_REALLOC            realloc  
 #define LBER_FREE                       free  
 #define LBER_VFREE                      ber_memvfree  
 #define LBER_STRDUP                     strdup  
 #define LBER_STRNDUP            ber_strndup__  
   
 #else  
 #define LBER_MALLOC(s)          ber_memalloc((s))  #define LBER_MALLOC(s)          ber_memalloc((s))
 #define LBER_CALLOC(n,s)        ber_memcalloc((n),(s))  #define LBER_CALLOC(n,s)        ber_memcalloc((n),(s))
 #define LBER_REALLOC(p,s)       ber_memrealloc((p),(s))  #define LBER_REALLOC(p,s)       ber_memrealloc((p),(s))
Line 188  LBER_F (char *) ber_strndup__( LDAP_CONS Line 179  LBER_F (char *) ber_strndup__( LDAP_CONS
 #define LBER_VFREE(v)           ber_memvfree((void**)(v))  #define LBER_VFREE(v)           ber_memvfree((void**)(v))
 #define LBER_STRDUP(s)          ber_strdup((s))  #define LBER_STRDUP(s)          ber_strdup((s))
 #define LBER_STRNDUP(s,l)       ber_strndup((s),(l))  #define LBER_STRNDUP(s,l)       ber_strndup((s),(l))
 #endif  
   
 /* sockbuf.c */  /* sockbuf.c */
   

Removed from v.1.61  
changed lines
  Added in v.1.62


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