Move ldap_utf8_*() declarations from ldap-int.h to ldap_pvt.h.

We may likely want to expose the routines at a later date (ldap_utf8.h?).

diff --git a/include/ldap_pvt.h b/include/ldap_pvt.h
index f849375d1c4e8aad9ee84c1b09b75a12e04b4d5d..f1a0ab6aef69aca2da5b5f6fded57f2aefafff4a 100644 (file)
--- a/include/ldap_pvt.h
+++ b/include/ldap_pvt.h
@@ -143,6 +143,30 @@ LIBLDAP_F (int) ldap_pvt_tls_set_option LDAP_P(( struct ldapoptions *lo, int opt
 LIBLDAP_F (int) ldap_pvt_tls_inplace LDAP_P(( Sockbuf *sb ));
 LIBLDAP_F (int) ldap_pvt_tls_start LDAP_P(( Sockbuf *sb, void *ctx_arg ));
 
+/*  
+ * UTF-8 (in utf-8.c)
+ */
+
+LIBLDAP_F (ber_len_t) ldap_utf8_bytes( const char * );
+LIBLDAP_F (ber_len_t) ldap_utf8_chars( const char * );
+LIBLDAP_F (int) ldap_utf8_charlen( const char * );
+
+LIBLDAP_F (char*) ldap_utf8_next( const char * );
+LIBLDAP_F (char*) ldap_utf8_prev( const char * );
+
+LIBLDAP_F (int) ldap_utf8_isascii( const char * );
+LIBLDAP_F (int) ldap_utf8_isalpa( const char * );
+LIBLDAP_F (int) ldap_utf8_isalnum( const char * );
+LIBLDAP_F (int) ldap_utf8_isdigit( const char * );
+LIBLDAP_F (int) ldap_utf8_isxdigit( const char * );
+LIBLDAP_F (int) ldap_utf8_isspace( const char * );
+
+LIBLDAP_F (ber_len_t) ldap_utf8_strcspn( const char* str, const char *set);
+LIBLDAP_F (ber_len_t) ldap_utf8_strspn( const char* str, const char *set);
+LIBLDAP_F (char *) ldap_utf8_strpbrk( const char* str, const char *set);
+LIBLDAP_F (char*) ldap_utf8_strtok( char* sp, const char* sep, char **last);
+
+
 LDAP_END_DECL
 
 #endif

diff --git a/libraries/liblber/memory.c b/libraries/liblber/memory.c
index 8169e789c46e94a919a68c8fe4ee75450462ba31..372124c7784d89f4a68d50783abaa53fe83e46f5 100644 (file)
--- a/libraries/liblber/memory.c
+++ b/libraries/liblber/memory.c
@@ -27,7 +27,7 @@ struct ber_mem_hdr {
 #define bm_junk        ber_align.bmu_len_t
 #define bm_data        ber_align.bmu_char[1]
 };
-#define BER_MEM_JUNK 0xddeeddeeU
+#define BER_MEM_JUNK 0xdeaddadaU
 static const struct ber_mem_hdr ber_int_mem_hdr = { BER_MEM_JUNK };
 #define BER_MEM_BADADDR        ((void *) &ber_int_mem_hdr.bm_data)
 #define BER_MEM_VALID(p)       do { \

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index 974d0dcf904777e6ef1606f4b7f6b7f6376d3c6d..9f292a659633860ca07802d41c7828609140551d 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -506,29 +506,6 @@ LIBLDAP_F (int) ldap_8859_to_t61( char **bufp, ber_len_t *buflenp, int free_inpu
 #endif /* LDAP_CHARSET_8859 == LDAP_DEFAULT_CHARSET */
 #endif /* STR_TRANSLATION && LDAP_DEFAULT_CHARSET */
 
-/*
- * UTF-8 (in utf-8.c)
- */
-
-LIBLDAP_F (ber_len_t) ldap_utf8_bytes( const char * );
-LIBLDAP_F (ber_len_t) ldap_utf8_chars( const char * );
-LIBLDAP_F (int) ldap_utf8_charlen( const char * );
-
-LIBLDAP_F (char*) ldap_utf8_next( const char * );
-LIBLDAP_F (char*) ldap_utf8_prev( const char * );
-
-LIBLDAP_F (int) ldap_utf8_isascii( const char * );
-LIBLDAP_F (int) ldap_utf8_isalpa( const char * );
-LIBLDAP_F (int) ldap_utf8_isalnum( const char * );
-LIBLDAP_F (int) ldap_utf8_isdigit( const char * );
-LIBLDAP_F (int) ldap_utf8_isxdigit( const char * );
-LIBLDAP_F (int) ldap_utf8_isspace( const char * );
-
-LIBLDAP_F (ber_len_t) ldap_utf8_strcspn( const char* str, const char *set);
-LIBLDAP_F (ber_len_t) ldap_utf8_strspn( const char* str, const char *set);
-LIBLDAP_F (char *) ldap_utf8_strpbrk( const char* str, const char *set);
-LIBLDAP_F (char*) ldap_utf8_strtok( char* sp, const char* sep, char **last);
-
 LDAP_END_DECL
 
 #endif /* _LDAP_INT_H */