mirror of
https://github.com/HeyPuter/firefox.git
synced 2026-11-13 20:14:57 -10:00
Andrew McCreight
6f88edd50e
* Mostly, this unbitrots the patches and updates line numbers.
* Define MOZ_XML_GetMismatchedTag and MOZ_XML_ProcessingEntityValue in
moz_xmlparse.c instead of these patches, to reduce future bitrot. This means
that 06_report_processing_entity.patch can be removed entirely.
* For 06_always_store_rawnames.patch, in the section from line 33 to 71 nothing
is really changing. The old diff was just really awful for some reason. For
the final chunk from line 72 to 86, that chunk of code with a call to
storeRawNames in internalEntityProcessor, so it could be deleted.
* 11_nested_entities.patch handles some kind of issue with nested entities.
This seems to correspond to code in internalEntityProcessor where there
is now an assertion:
assert(parser->m_openInternalEntities == openEntity);
So I guess it is no longer needed. Peter removed it from his patch stack.
* Renumber the patches to account for the two removed ones.
* In 11_no_debug_report.patch, a new struct MALLOC_TRACKER has been added.
I had to remove new debugLevel here, as well as peakBytesAllocated, which
as it says is only used when debugLevel is set. expat_heap_stat is also
only used by that code, so it gets removed, too.
* 12_unused.patch removes a bunch of unused code. The stuff around line 56
had to change because a new function, parserBusy, that is used was added
into the middle of a bunch of unused functions.
Differential Revision: https://phabricator.services.mozilla.com/D278892
48 lines
1.2 KiB
Diff
48 lines
1.2 KiB
Diff
diff --git a/expat/lib/expat_external.h b/expat/lib/expat_external.h
|
|
--- a/expat/lib/expat_external.h
|
|
+++ b/expat/lib/expat_external.h
|
|
@@ -138,6 +138,9 @@ extern "C" {
|
|
# endif
|
|
# endif
|
|
|
|
+/* BEGIN MOZILLA CHANGE (typedef XML_Char to char16_t) */
|
|
+#if 0
|
|
+
|
|
# ifdef XML_UNICODE /* Information is UTF-16 encoded. */
|
|
# ifdef XML_UNICODE_WCHAR_T
|
|
typedef wchar_t XML_Char;
|
|
@@ -151,6 +154,9 @@ typedef char XML_Char;
|
|
typedef char XML_LChar;
|
|
# endif /* XML_UNICODE */
|
|
|
|
+#endif
|
|
+/* END MOZILLA CHANGE */
|
|
+
|
|
# ifdef XML_LARGE_SIZE /* Use large integers for file/stream positions. */
|
|
typedef long long XML_Index;
|
|
typedef unsigned long long XML_Size;
|
|
diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
|
|
index a187a3a18f19..3a3bb9aa45e2 100644
|
|
--- a/expat/lib/xmlparse.c
|
|
+++ b/expat/lib/xmlparse.c
|
|
@@ -195,6 +195,9 @@ typedef char ICHAR;
|
|
|
|
#endif
|
|
|
|
+/* BEGIN MOZILLA CHANGE (typedef XML_Char to char16_t) */
|
|
+#if 0
|
|
+
|
|
#ifdef XML_UNICODE
|
|
|
|
# ifdef XML_UNICODE_WCHAR_T
|
|
@@ -212,6 +215,9 @@ typedef char ICHAR;
|
|
|
|
#endif
|
|
|
|
+#endif
|
|
+/* END MOZILLA CHANGE */
|
|
+
|
|
/* Round up n to be a multiple of sz, where sz is a power of 2. */
|
|
#define ROUND_UP(n, sz) (((n) + ((sz) - 1)) & ~((sz) - 1))
|
|
|