libxml2.12.patch 1.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748
  1. diff --git a/include/iprt/cpp/xml.h b/include/iprt/cpp/xml.h
  2. index 40975e86..7639c281 100644
  3. --- a/include/iprt/cpp/xml.h
  4. +++ b/include/iprt/cpp/xml.h
  5. @@ -113,9 +113,9 @@ public:
  6. class RT_DECL_CLASS XmlError : public RuntimeError
  7. {
  8. public:
  9. - XmlError(xmlErrorPtr aErr);
  10. + XmlError(const xmlError *aErr);
  11. - static char* Format(xmlErrorPtr aErr);
  12. + static char* Format(const xmlError *aErr);
  13. };
  14. // Logical errors
  15. diff --git a/src/VBox/Runtime/r3/xml.cpp b/src/VBox/Runtime/r3/xml.cpp
  16. index a6661760..b301a6c6 100644
  17. --- a/src/VBox/Runtime/r3/xml.cpp
  18. +++ b/src/VBox/Runtime/r3/xml.cpp
  19. @@ -131,7 +131,7 @@ LogicError::LogicError(RT_SRC_POS_DECL)
  20. RTStrFree(msg);
  21. }
  22. -XmlError::XmlError(xmlErrorPtr aErr)
  23. +XmlError::XmlError(const xmlError *aErr)
  24. {
  25. if (!aErr)
  26. throw EInvalidArg(RT_SRC_POS);
  27. @@ -145,7 +145,7 @@ XmlError::XmlError(xmlErrorPtr aErr)
  28. * Composes a single message for the given error. The caller must free the
  29. * returned string using RTStrFree() when no more necessary.
  30. */
  31. -/* static */ char *XmlError::Format(xmlErrorPtr aErr)
  32. +/* static */ char *XmlError::Format(const xmlError *aErr)
  33. {
  34. const char *msg = aErr->message ? aErr->message : "<none>";
  35. size_t msgLen = strlen(msg);
  36. @@ -1856,7 +1856,7 @@ static void xmlParserBaseGenericError(void *pCtx, const char *pszMsg, ...) RT_NO
  37. va_end(args);
  38. }
  39. -static void xmlParserBaseStructuredError(void *pCtx, xmlErrorPtr error) RT_NOTHROW_DEF
  40. +static void xmlParserBaseStructuredError(void *pCtx, const xmlError *error) RT_NOTHROW_DEF
  41. {
  42. NOREF(pCtx);
  43. /* we expect that there is always a trailing NL */