move lber_*_x memory prototypes to lber_pvt.h

diff --git a/include/lber.h b/include/lber.h
index 20095179a61726c01191697d43243d06e058f109..5db9fb39f3327e193c7c0b0c514d4d110ef1093f 100644 (file)
--- a/include/lber.h
+++ b/include/lber.h
@@ -602,63 +602,6 @@ ber_bvarray_free LDAP_P(( BerVarray p ));
 LBER_F( int )
 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) \
        ((v1)->bv_len < (v2)->bv_len \
                ? -1 : ((v1)->bv_len > (v2)->bv_len \

diff --git a/include/lber_pvt.h b/include/lber_pvt.h
index 7f5a141e1fbcdb23a3656a896b7462cd12604b37..48817d1b01441e5b5a47a4dc71a1f08bde4e323c 100644 (file)
--- a/include/lber_pvt.h
+++ b/include/lber_pvt.h
@@ -61,6 +61,65 @@ ber_pvt_sb_copy_out LDAP_P(( Sockbuf_Buf *sbb, char *buf, ber_len_t len ));
 LBER_F( int )
 ber_pvt_socket_set_nonblock LDAP_P(( ber_socket_t sd, int nb ));
 
+/*
+ * memory.c
+ */
+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 ));
 
 #if 0
 #define ber_bvstrcmp(v1,v2) \