#include "ldap_defaults.h"
#undef ISASCII
-#define ISASCII(uc) ((uc) < 0x100)
-#undef UCS4_INVALID
-#define UCS4_INVALID 0x80000000U
+#define ISASCII(uc) ((uc) < 0x80)
/*
* Basic UTF-8 routines
len = LDAP_UTF8_CHARLEN(p);
- if( len == 0 ) return UCS4_INVALID;
+ if( len == 0 ) return LDAP_UCS4_INVALID;
ch = c[0] & mask[len];
for(i=1; i < len; i++) {
if ((c[i] & 0xc0) != 0x80) {
- return UCS4_INVALID;
+ return LDAP_UCS4_INVALID;
}
ch <<= 6;
p[len++] = 0x80 | ( (c >> 6) & 0x3f );
p[len++] = 0x80 | ( c & 0x3f );
- } else if( c < 0x400000 ) {
+ } else if( c < 0x4000000 ) {
p[len++] = 0xf8 | ( c >> 24 );
p[len++] = 0x80 | ( (c >> 18) & 0x3f );
p[len++] = 0x80 | ( (c >> 12) & 0x3f );
/*
* UTF-8 ctype routines
- * Only deals with characters < 0x100 (ie: US-ASCII)
+ * Only deals with characters < 0x80 (ie: US-ASCII)
*/
int ldap_utf8_isascii( const char * p )
const char *cset;
for( cstr = str; *cstr != '\0'; LDAP_UTF8_INCR(cstr) ) {
-
for( cset = set; ; LDAP_UTF8_INCR(cset) ) {
if( *cset == '\0' ) {
return cstr - str;