--- embedaddon/pcre/pcre_valid_utf8.c 2012/02/21 23:05:51 1.1 +++ embedaddon/pcre/pcre_valid_utf8.c 2013/07/22 08:25:56 1.1.1.3 @@ -6,7 +6,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel - Copyright (c) 1997-2009 University of Cambridge + Copyright (c) 1997-2013 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -92,6 +92,7 @@ PCRE_UTF8_ERR18 Overlong 5-byte sequence (won't ever PCRE_UTF8_ERR19 Overlong 6-byte sequence (won't ever occur) PCRE_UTF8_ERR20 Isolated 0x80 byte (not within UTF-8 character) PCRE_UTF8_ERR21 Byte with the illegal value 0xfe or 0xff +PCRE_UTF8_ERR22 Unused (was non-character) Arguments: string points to the string @@ -103,10 +104,10 @@ Returns: = 0 if the string is a valid UTF-8 s */ int -_pcre_valid_utf8(USPTR string, int length, int *erroroffset) +PRIV(valid_utf)(PCRE_PUCHAR string, int length, int *erroroffset) { -#ifdef SUPPORT_UTF8 -register USPTR p; +#ifdef SUPPORT_UTF +register PCRE_PUCHAR p; if (length < 0) { @@ -116,7 +117,7 @@ if (length < 0) for (p = string; length-- > 0; p++) { - register int ab, c, d; + register pcre_uchar ab, c, d; c = *p; if (c < 128) continue; /* ASCII character */ @@ -133,7 +134,7 @@ for (p = string; length-- > 0; p++) return PCRE_UTF8_ERR21; } - ab = _pcre_utf8_table4[c & 0x3f]; /* Number of additional bytes */ + ab = PRIV(utf8_table4)[c & 0x3f]; /* Number of additional bytes */ if (length < ab) { *erroroffset = (int)(p - string); /* Missing bytes */ @@ -288,9 +289,10 @@ for (p = string; length-- > 0; p++) } } -#else /* SUPPORT_UTF8 */ +#else /* Not SUPPORT_UTF */ (void)(string); /* Keep picky compilers happy */ (void)(length); +(void)(erroroffset); #endif return PCRE_UTF8_ERR0; /* This indicates success */