Revision: 1102
http://vcs.pcre.org/viewvc?view=rev&revision=1102
Author: chpe
Date: 2012-10-16 16:56:34 +0100 (Tue, 16 Oct 2012)
Log Message:
-----------
pcre32: Use pcre_uint32 for characters
Modified Paths:
--------------
code/trunk/pcre_exec.c
code/trunk/pcre_study.c
Modified: code/trunk/pcre_exec.c
===================================================================
--- code/trunk/pcre_exec.c 2012-10-16 15:56:30 UTC (rev 1101)
+++ code/trunk/pcre_exec.c 2012-10-16 15:56:34 UTC (rev 1102)
@@ -3310,7 +3310,7 @@
if (length > 1)
{
#ifdef SUPPORT_UCP
- unsigned int othercase;
+ pcre_uint32 othercase;
if (op >= OP_STARI && /* Caseless */
(othercase = UCD_OTHERCASE(fc)) != fc)
oclength = PRIV(ord2utf)(othercase, occhars);
@@ -3746,7 +3746,7 @@
#ifdef SUPPORT_UTF
if (utf)
{
- register unsigned int d;
+ register pcre_uint32 d;
for (fi = min;; fi++)
{
RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);
@@ -3791,7 +3791,7 @@
#ifdef SUPPORT_UTF
if (utf)
{
- register unsigned int d;
+ register pcre_uint32 d;
for (i = min; i < max; i++)
{
int len = 1;
@@ -3848,7 +3848,7 @@
#ifdef SUPPORT_UTF
if (utf)
{
- register unsigned int d;
+ register pcre_uint32 d;
for (i = 1; i <= min; i++)
{
if (eptr >= md->end_subject)
@@ -3882,7 +3882,7 @@
#ifdef SUPPORT_UTF
if (utf)
{
- register unsigned int d;
+ register pcre_uint32 d;
for (fi = min;; fi++)
{
RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);
@@ -3926,7 +3926,7 @@
#ifdef SUPPORT_UTF
if (utf)
{
- register unsigned int d;
+ register pcre_uint32 d;
for (i = min; i < max; i++)
{
int len = 1;
Modified: code/trunk/pcre_study.c
===================================================================
--- code/trunk/pcre_study.c 2012-10-16 15:56:30 UTC (rev 1101)
+++ code/trunk/pcre_study.c 2012-10-16 15:56:34 UTC (rev 1102)
@@ -547,7 +547,7 @@
set_table_bit(pcre_uint8 *start_bits, const pcre_uchar *p, BOOL caseless,
compile_data *cd, BOOL utf)
{
-unsigned int c = *p;
+pcre_uint32 c = *p;
#ifdef COMPILE_PCRE8
SET_BIT(c);