bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

libcef: Convert NULL to nullptr (see issue #2861)

Browse Source
This commit is contained in:
Marshall Greenblatt
2020-01-15 14:36:24 +01:00
parent c05c3e4065
commit ea63799c3e
98 changed files with 538 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libcef/browser/xml_reader_impl.cc
View File

@@ -14,7 +14,7 @@ CefRefPtr<CefXmlReader> CefXmlReader::Create(CefRefPtr<CefStreamReader> stream,
const CefString& URI) {
CefRefPtr<CefXmlReaderImpl> impl(new CefXmlReaderImpl());
if (!impl->Initialize(stream, encodingType, URI))
return NULL;
return nullptr;
return impl.get();
}
@@ -107,10 +107,11 @@ CefString xmlCharToString(const xmlChar* xmlStr, bool free) {
} // namespace
CefXmlReaderImpl::CefXmlReaderImpl()
: supported_thread_id_(base::PlatformThread::CurrentId()), reader_(NULL) {}
: supported_thread_id_(base::PlatformThread::CurrentId()),
reader_(nullptr) {}
CefXmlReaderImpl::~CefXmlReaderImpl() {
if (reader_ != NULL) {
if (reader_ != nullptr) {
if (!VerifyContext()) {
// Close() is supposed to be called directly. We'll try to free the reader
// now on the wrong thread but there's no guarantee this call won't crash.
@@ -183,7 +184,7 @@ bool CefXmlReaderImpl::Close() {
// The input buffer will be freed automatically.
xmlFreeTextReader(reader_);
reader_ = NULL;
reader_ = nullptr;
return true;
}
@@ -309,7 +310,7 @@ CefString CefXmlReaderImpl::GetValue() {
if (xmlTextReaderNodeType(reader_) == XML_READER_TYPE_ENTITY_REFERENCE) {
// Provide special handling to return entity reference values.
xmlNodePtr node = xmlTextReaderCurrentNode(reader_);
if (node->content != NULL)
if (node->content != nullptr)
return xmlCharToString(node->content, false);
return CefString();
} else {
@@ -447,5 +448,5 @@ bool CefXmlReaderImpl::VerifyContext() {
return false;
}
return (reader_ != NULL);
return (reader_ != nullptr);
}