diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-30 13:21:45 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-30 13:29:13 +0100 |
| commit | a9e3dc3c2acf95248cb0f64634ca5b203802d46e (patch) | |
| tree | 69520928e5e966be1ba5778c43f69d8173cd260e | |
| parent | 6ed854fa980804e71365c82821131bbe0cc9708c (diff) | |
stop spewing libxml2 warnings during filter detection
Change-Id: Ifef3e75065e55aefba0f9498cf517efaf78ba6c1
| -rw-r--r-- | external/libetonyek/UnpackedTarball_libetonyek.mk | 1 | ||||
| -rw-r--r-- | external/libetonyek/silence-libxml.patch | 24 |
2 files changed, 25 insertions, 0 deletions
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk index eba2f6a8b574..82c1709a69b5 100644 --- a/external/libetonyek/UnpackedTarball_libetonyek.mk +++ b/external/libetonyek/UnpackedTarball_libetonyek.mk @@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\ external/libetonyek/win_build.patch.1 \ external/libetonyek/ubsan.patch \ external/libetonyek/rpath.patch \ + external/libetonyek/silence-libxml.patch \ external/libetonyek/0001-fix-brain-fart.patch.1 \ )) diff --git a/external/libetonyek/silence-libxml.patch b/external/libetonyek/silence-libxml.patch new file mode 100644 index 000000000000..f8730bf332b2 --- /dev/null +++ b/external/libetonyek/silence-libxml.patch @@ -0,0 +1,24 @@ +--- src/lib/EtonyekDocument.cpp ++++ src/lib/EtonyekDocument.cpp +@@ -103,12 +103,21 @@ + return false; + } + ++namespace ++{ ++ void handleError(void * /*arg*/, const char * /*msg*/, xmlParserSeverities /*severity*/, xmlTextReaderLocatorPtr /*locator*/) ++ { ++ } ++} ++ + bool probeXML(DetectionInfo &info) + { + const shared_ptr<xmlTextReader> reader(xmlReaderForIO(readFromStream, closeStream, info.m_input.get(), "", 0, 0), xmlFreeTextReader); + if (!reader) + return false; + ++ xmlTextReaderSetErrorHandler(reader.get(), handleError, NULL); ++ + int ret = 0; + do + { |