Diff for /include/lber.h between versions 1.83 and 1.83.2.10

version 1.83, 2003/05/19 23:45:12 version 1.83.2.10, 2004/11/28 21:19:39
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/include/lber.h,v 1.82 2003/04/09 11:26:22 hyc Exp $ */  /* $OpenLDAP: pkg/ldap/include/lber.h,v 1.83.2.9 2004/03/17 20:15:31 kurt Exp $ */
 /*  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA   *
    * Copyright 1998-2004 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
  * modification, are permitted only as authorized by the OpenLDAP   * modification, are permitted only as authorized by the OpenLDAP
  * Public License.  A copy of this license is available at   * Public License.
  * http://www.OpenLDAP.org/license.html or in file LICENSE in the   *
  * top-level directory of the distribution.   * A copy of this license is available in file LICENSE in the
    * top-level directory of the distribution or, alternatively, at
    * <http://www.OpenLDAP.org/license.html>.
  */   */
 /* Portions  /* Portions Copyright (c) 1990 Regents of the University of Michigan.
  * Copyright (c) 1990 Regents of the University of Michigan.  
  * All rights reserved.   * All rights reserved.
  *   *
  * Redistribution and use in source and binary forms are permitted   * Redistribution and use in source and binary forms are permitted
Line 25 Line 27
 #define _LBER_H  #define _LBER_H
   
 #include <lber_types.h>  #include <lber_types.h>
   #include <string.h>
   
 LDAP_BEGIN_DECL  LDAP_BEGIN_DECL
   
Line 149  typedef struct lber_memory_fns { Line 152  typedef struct lber_memory_fns {
 #define LBER_OPT_SOCKBUF_DEBUG          0x1002  #define LBER_OPT_SOCKBUF_DEBUG          0x1002
   
 /* on/off values */  /* on/off values */
 #define LBER_OPT_ON             ((void *) 1)  LBER_V( char ) ber_pvt_opt_on;
   #define LBER_OPT_ON             ((void *) &ber_pvt_opt_on)
 #define LBER_OPT_OFF    ((void *) 0)  #define LBER_OPT_OFF    ((void *) 0)
   
 #define LBER_OPT_SUCCESS        (0)  #define LBER_OPT_SUCCESS        (0)
 #define LBER_OPT_ERROR          (-1)  #define LBER_OPT_ERROR          (-1)
   
 #define LBER_ELEMENT_SIZEOF (256) /* must be >= sizeof(BerElement) */  
 typedef struct berelement BerElement;  typedef struct berelement BerElement;
 typedef struct sockbuf Sockbuf;  typedef struct sockbuf Sockbuf;
 typedef struct seqorset Seqorset;  typedef struct seqorset Seqorset;
Line 531  LBER_V( Sockbuf_IO ) ber_sockbuf_io_tcp; Line 534  LBER_V( Sockbuf_IO ) ber_sockbuf_io_tcp;
 LBER_V( Sockbuf_IO ) ber_sockbuf_io_readahead;  LBER_V( Sockbuf_IO ) ber_sockbuf_io_readahead;
 LBER_V( Sockbuf_IO ) ber_sockbuf_io_fd;  LBER_V( Sockbuf_IO ) ber_sockbuf_io_fd;
 LBER_V( Sockbuf_IO ) ber_sockbuf_io_debug;  LBER_V( Sockbuf_IO ) ber_sockbuf_io_debug;
 #ifdef LDAP_CONNECTIONLESS  
 LBER_V( Sockbuf_IO ) ber_sockbuf_io_udp;  LBER_V( Sockbuf_IO ) ber_sockbuf_io_udp;
 #endif  
   
 /*  /*
  * LBER memory.c   * LBER memory.c
Line 582  ber_bvdup LDAP_P(( Line 583  ber_bvdup LDAP_P((
         struct berval *src ));          struct berval *src ));
   
 LBER_F( struct berval * )  LBER_F( struct berval * )
 ber_str2bv LDAP_P((  ber_mem2bv LDAP_P((
         LDAP_CONST char *, ber_len_t len, int dup, struct berval *bv));          LDAP_CONST char *, ber_len_t len, int duplicate, struct berval *bv));
   
 LBER_F( struct berval * )  LBER_F( struct berval * )
 ber_mem2bv LDAP_P((  ber_str2bv LDAP_P((
         LDAP_CONST char *, ber_len_t len, int dup, struct berval *bv));          LDAP_CONST char *, ber_len_t len, int duplicate, struct berval *bv));
   
 #define ber_bvstr(a)    ber_str2bv(a, 0, 0, NULL)  #define ber_bvstr(a)    ((ber_str2bv)((a), 0, 0, NULL))
 #define ber_bvstrdup(a) ber_str2bv(a, 0, 1, NULL)  #define ber_bvstrdup(a) ((ber_str2bv)((a), 0, 1, NULL))
   
 LBER_F( char * )  LBER_F( char * )
 ber_strdup LDAP_P((  ber_strdup LDAP_P((
Line 602  ber_bvarray_free LDAP_P(( BerVarray p )) Line 603  ber_bvarray_free LDAP_P(( BerVarray p ))
 LBER_F( int )  LBER_F( int )
 ber_bvarray_add LDAP_P(( BerVarray *p, BerValue *bv ));  ber_bvarray_add LDAP_P(( BerVarray *p, BerValue *bv ));
   
 LBER_F( void * )  
 ber_memalloc_x LDAP_P((  
         ber_len_t s, void *ctx));  
   
 LBER_F( void * )  
 ber_memrealloc_x LDAP_P((  
         void* p,  
         ber_len_t s, void *ctx ));  
   
 LBER_F( void * )  
 ber_memcalloc_x LDAP_P((  
         ber_len_t n,  
         ber_len_t s, void *ctx ));  
   
 LBER_F( void )  
 ber_memfree_x LDAP_P((  
         void* p, void *ctx ));  
   
 LBER_F( void )  
 ber_memvfree_x LDAP_P((  
         void** vector, void *ctx ));  
   
 LBER_F( void )  
 ber_bvfree_x LDAP_P((  
         struct berval *bv, void *ctx ));  
   
 LBER_F( void )  
 ber_bvecfree_x LDAP_P((  
         struct berval **bv, void *ctx ));  
   
 LBER_F( int )  
 ber_bvecadd_x LDAP_P((  
         struct berval ***bvec,  
         struct berval *bv, void *ctx ));  
   
 LBER_F( struct berval * )  
 ber_dupbv_x LDAP_P((  
         struct berval *dst, struct berval *src, void *ctx ));  
   
 LBER_F( struct berval * )  
 ber_str2bv_x LDAP_P((  
         LDAP_CONST char *, ber_len_t len, int dup, struct berval *bv, void *ctx));  
   
 LBER_F( struct berval * )  
 ber_mem2bv_x LDAP_P((  
         LDAP_CONST char *, ber_len_t len, int dup, struct berval *bv, void *ctx));  
   
 LBER_F( char * )  
 ber_strdup_x LDAP_P((  
         LDAP_CONST char *, void *ctx ));  
   
 LBER_F( void )  
 ber_bvarray_free_x LDAP_P(( BerVarray p, void *ctx ));  
   
 LBER_F( int )  
 ber_bvarray_add_x LDAP_P(( BerVarray *p, BerValue *bv, void *ctx ));  
   
 #define ber_bvcmp(v1,v2) \  #define ber_bvcmp(v1,v2) \
         ((v1)->bv_len < (v2)->bv_len \          ((v1)->bv_len < (v2)->bv_len \
                 ? -1 : ((v1)->bv_len > (v2)->bv_len \                  ? -1 : ((v1)->bv_len > (v2)->bv_len \

Removed from v.1.83  
changed lines
  Added in v.1.83.2.10


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