Changeset 26697 in webkit for trunk/JavaScriptCore/pcre/pcre_get.c

Timestamp:

Oct 16, 2007, 10:38:39 PM (18 years ago)

Author:

darin

Message:

Reviewed by Geoff.

• merged PCRE changes between 6.4 and 6.5

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj: Removed pcre_config.c, pcre_globals.c, pcre_info.c, pcre_maketables.c, pcre_printint.src, pcre_refcount.c, pcre_study.c, pcre_try_flipped.c, pcre_ucp_findchar.c, pcre_version.c, and ucptable.c. Added pcre_ucp_searchfuncs.c.

• pcre/AUTHORS:
• pcre/LICENCE:
• pcre/MERGING:
• pcre/dftables.c:
• pcre/pcre-config.h:
• pcre/pcre.h:
• pcre/pcre.pri:
• pcre/pcre_compile.c:
• pcre/pcre_exec.c:
• pcre/pcre_fullinfo.c:
• pcre/pcre_get.c:
• pcre/pcre_internal.h:
• pcre/pcre_maketables.c:
• pcre/pcre_ord2utf8.c:
• pcre/pcre_tables.c:
• pcre/pcre_ucp_searchfuncs.c: Copied from pcre/pcre_ucp_findchar.c.
• pcre/pcre_xclass.c:
• pcre/ucp.h:
• pcre/ucpinternal.h:
• pcre/ucptable.c: Updated with new versions from the PCRE 6.5 release, merged with changes.

• pcre/pcre_config.c: Removed.
• pcre/pcre_globals.c: Removed.
• pcre/pcre_info.c: Removed.
• pcre/pcre_printint.src: Removed.
• pcre/pcre_refcount.c: Removed.
• pcre/pcre_study.c: Removed.
• pcre/pcre_try_flipped.c: Removed.
• pcre/pcre_ucp_findchar.c: Removed.
• pcre/pcre_version.c: Removed.

File:

• trunk/JavaScriptCore/pcre/pcre_get.c (modified) (4 diffs)

trunk/JavaScriptCore/pcre/pcre_get.c

@@ -7 +7 @@
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2005 University of Cambridge
+           Copyright (c) 1997-2006 University of Cambridge
 
 -----------------------------------------------------------------------------
@@ -63 +63 @@
 */
 
-int
-pcre_get_stringnumber(const pcre *code, const pcre_char *stringname)
-{
 /* FIXME: This doesn't work for UTF-16 because the name table has 8-bit characters in it! */
 #if !PCRE_UTF16
+int
+pcre_get_stringnumber(const pcre *code, const pcre_char *stringname)
+{
 int rc;
 int entrysize;
@@ -91 +91 @@
   if (c > 0) bot = mid + 1; else top = mid;
   }
-#else
- UNUSED_PARAM(code);
- UNUSED_PARAM(stringname);
+
+return PCRE_ERROR_NOSUBSTRING;
+}
 #endif
-
-return PCRE_ERROR_NOSUBSTRING;
-}
 
 
@@ -214 +211 @@
 pcre_char *p;
 
-for (i = 0; i < double_count; i += 2) {
-  size += INT_CAST(sizeof(pcre_char *) + (ovector[i+1] - ovector[i] + 1) * sizeof(pcre_char));
-}
+for (i = 0; i < double_count; i += 2)
+  size += sizeof(pcre_char *) + (ovector[i+1] - ovector[i] + 1) * sizeof(pcre_char);
 
 stringlist = (pcre_char **)(pcre_malloc)(size);