Commit 22ba5537 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

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?).
parent aa934d06
......@@ -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
......
......@@ -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 { \
......
......@@ -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 */
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment