Changeset 18526 in webkit

Timestamp:

Jan 2, 2007 9:39:50 AM (17 years ago)

Author:

darin

Message:

• minor tweak (hope this doesn't re-break Windows)

• pcre/pcre_compile.c: Removed use of const pcre_uchar const * -- Mitz probably meant const pcre_uchar *const, but I think we can do without the explicit const here.

• pcre/pcre_internal.h: Re-enabled warning C4114.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• pcre/pcre_compile.c (modified) (8 diffs)
• pcre/pcre_internal.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-01-02  Darin Adler  <darin@apple.com>
+
+        - minor tweak (hope this doesn't re-break Windows)
+
+        * pcre/pcre_compile.c: Removed use of const pcre_uchar const * -- Mitz probably
+        meant const pcre_uchar *const, but I think we can do without the explicit const here.
+
+        * pcre/pcre_internal.h: Re-enabled warning C4114.
+
 2007-01-02  David Kilzer  <ddkilzer@webkit.org>
 

trunk/JavaScriptCore/pcre/pcre_compile.c

@@ -356 +356 @@
 
 static BOOL
-  compile_regex(int, int, int *, uschar **, const pcre_uchar **, const pcre_uchar const*, int *, BOOL, int,
+  compile_regex(int, int, int *, uschar **, const pcre_uchar **, const pcre_uchar *, int *, BOOL, int,
     int *, int *, branch_chain *, compile_data *);
 
@@ -384 +384 @@
 
 static int
-check_escape(const pcre_uchar **ptrptr, const pcre_uchar const* patternEnd, int *errorcodeptr, int bracount,
+check_escape(const pcre_uchar **ptrptr, const pcre_uchar *patternEnd, int *errorcodeptr, int bracount,
   int options, BOOL isclass)
 {
@@ -596 +596 @@
 
 static int
-get_ucp(const pcre_uchar **ptrptr, const pcre_uchar const* patternEnd, BOOL *negptr, int *errorcodeptr)
+get_ucp(const pcre_uchar **ptrptr, const pcre_uchar *patternEnd, BOOL *negptr, int *errorcodeptr)
 {
 int c, i, bot, top;
@@ -689 +689 @@
 
 static BOOL
-is_counted_repeat(const pcre_uchar *p, const pcre_uchar const* patternEnd)
+is_counted_repeat(const pcre_uchar *p, const pcre_uchar *patternEnd)
 {
 if (p >= patternEnd || (DIGITAB(*p) & ctype_digit) == 0)
@@ -1373 +1373 @@
 
 static BOOL
-check_posix_syntax(const pcre_uchar *ptr, const pcre_uchar const *patternEnd, const pcre_uchar **endptr, compile_data *cd)
+check_posix_syntax(const pcre_uchar *ptr, const pcre_uchar *patternEnd, const pcre_uchar **endptr, compile_data *cd)
 {
 int terminator;          /* Don't combine these lines; the Solaris cc */
@@ -1600 +1600 @@
 static BOOL
 compile_branch(int *optionsptr, int *brackets, uschar **codeptr,
-  const pcre_uchar **ptrptr, const pcre_uchar const* patternEnd, int *errorcodeptr, int *firstbyteptr,
+  const pcre_uchar **ptrptr, const pcre_uchar *patternEnd, int *errorcodeptr, int *firstbyteptr,
   int *reqbyteptr, branch_chain *bcptr, compile_data *cd)
 {
@@ -3503 +3503 @@
 static BOOL
 compile_regex(int options, int oldims, int *brackets, uschar **codeptr,
-  const pcre_uchar **ptrptr, const pcre_uchar const* patternEnd, int *errorcodeptr, BOOL lookbehind, int skipbytes,
+  const pcre_uchar **ptrptr, const pcre_uchar *patternEnd, int *errorcodeptr, BOOL lookbehind, int skipbytes,
   int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr, compile_data *cd)
 {
@@ -3956 +3956 @@
 const uschar *codestart;
 const pcre_uchar *ptr;
-const pcre_uchar const* patternEnd;
+const pcre_uchar *patternEnd;
 compile_data compile_block;
 int brastack[BRASTACK_SIZE];

trunk/JavaScriptCore/pcre/pcre_internal.h

@@ -58 +58 @@
 
 #if COMPILER(MSVC)
-#pragma warning(disable: 4114)
 #pragma warning(disable: 4232)
 #pragma warning(disable: 4244)