Commits

Christian Heimes  committed b0df6c0

feature enum and error messages are part of the stable api
always declare protection constants

  • Participants
  • Parent commits 0ab22de

Comments (0)

Files changed (2)

File expat/expat.h

   /* Added in 2.0. */
   XML_ERROR_RESERVED_PREFIX_XML,
   XML_ERROR_RESERVED_PREFIX_XMLNS,
-  XML_ERROR_RESERVED_NAMESPACE_URI
-#ifdef XML_BOMB_PROTECTION
+  XML_ERROR_RESERVED_NAMESPACE_URI,
   /* Added in 2.2. */
-  ,
   XML_ERROR_ENTITY_INDIRECTIONS,
   XML_ERROR_ENTITY_EXPANSION
-#endif
 };
 
 enum XML_Content_Type {
   XML_FEATURE_SIZEOF_XML_LCHAR,
   XML_FEATURE_NS,
   XML_FEATURE_LARGE_SIZE,
-  XML_FEATURE_ATTR_INFO
-#ifdef XML_BOMB_PROTECTION
+  XML_FEATURE_ATTR_INFO,
   /* Added in 2.2. */
-  ,
   XML_FEATURE_BOMB_PROTECTION,
   XML_FEATURE_MAX_ENTITY_INDIRECTIONS,
   XML_FEATURE_MAX_ENTITY_EXPANSIONS,
   XML_FEATURE_RESET_DTD
-#endif
   /* Additional features must be added to the end of this enum. */
 };
 

File expat/xmlparse.c

     XML_L("cannot suspend in external parameter entity"),
     XML_L("reserved prefix (xml) must not be undeclared or bound to another namespace name"),
     XML_L("reserved prefix (xmlns) must not be declared or undeclared"),
-    XML_L("prefix must not be bound to one of the reserved namespace names")
-#ifdef XML_BOMB_PROTECTION
-    ,
+    XML_L("prefix must not be bound to one of the reserved namespace names"),
     XML_L("entity indirection limit exceeded"),
     XML_L("document's entity expansion limit exceeded")
-#endif
   };
   if (code > 0 && code < sizeof(message)/sizeof(message[0]))
     return message[code];