VladPolskiy/MariaDB
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-25 16:39:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Connect engine - fix compiler error with MSVC 17.12

Browse Source 
error C2664: 'bool TestHr(PGLOBAL,HRESULT)': cannot convert argument 2
from 'MSXML2::IXMLDOMNodePtr' to 'HRESULT'

Prior to 17.12, there was a code-analysis warning C6216 at the affected
places (compiler generated cast between semantically different integral
types).
This commit is contained in:
Vladislav Vaintroub
2024-11-13 23:07:02 +01:00
parent cad881ab10
commit 8a3c53f32b
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
storage/connect/domdoc.cpp
View File

@ -165,7 +165,8 @@ bool DOMDOC::NewDoc(PGLOBAL g, PCSZ ver)
sprintf(buf, "version=\"%s\" encoding=\"%s\"", ver, Encoding); sprintf(buf, "version=\"%s\" encoding=\"%s\"", ver, Encoding);
pip = Docp->createProcessingInstruction("xml", buf); pip = Docp->createProcessingInstruction("xml", buf);
return(TestHr(g, Docp->appendChild(pip))); Docp->appendChild(pip);
return false;
} // end of NewDoc } // end of NewDoc
/******************************************************************/ /******************************************************************/
@ -173,7 +174,7 @@ bool DOMDOC::NewDoc(PGLOBAL g, PCSZ ver)
/******************************************************************/ /******************************************************************/
void DOMDOC::AddComment(PGLOBAL g, char *com) void DOMDOC::AddComment(PGLOBAL g, char *com)
{ {
TestHr(g, Docp->appendChild(Docp->createComment(com))); Docp->appendChild(Docp->createComment(com));
} // end of AddComment } // end of AddComment
/******************************************************************/ /******************************************************************/
@ -196,9 +197,9 @@ PXNODE DOMDOC::NewRoot(PGLOBAL g, char *name)
{ {
MSXML2::IXMLDOMElementPtr ep = Docp->createElement(name); MSXML2::IXMLDOMElementPtr ep = Docp->createElement(name);
if (ep == NULL || TestHr(g, Docp->appendChild(ep))) if (ep == NULL)
return NULL; return NULL;
Docp->appendChild(ep);
return new(g) DOMNODE(this, ep); return new(g) DOMNODE(this, ep);
} // end of NewRoot } // end of NewRoot
@ -552,9 +553,9 @@ PXNODE DOMNODE::AddChildNode(PGLOBAL g, PCSZ name, PXNODE np)
_bstr_t pfx = ep->prefix; _bstr_t pfx = ep->prefix;
_bstr_t uri = ep->namespaceURI; _bstr_t uri = ep->namespaceURI;
if (ep == NULL || TestHr(g, Nodep->appendChild(ep))) if (ep == NULL)
return NULL; return NULL;
Nodep->appendChild(ep);
if (np) if (np)
((PDOMNODE)np)->Nodep = ep; ((PDOMNODE)np)->Nodep = ep;
else else
@ -593,7 +594,7 @@ void DOMNODE::AddText(PGLOBAL g, PCSZ txtp)
MSXML2::IXMLDOMTextPtr tp= Docp->createTextNode((_bstr_t)txtp); MSXML2::IXMLDOMTextPtr tp= Docp->createTextNode((_bstr_t)txtp);
if (tp != NULL) if (tp != NULL)
TestHr(g, Nodep->appendChild(tp)); Nodep->appendChild(tp);
} // end of AddText } // end of AddText
@ -602,7 +603,7 @@ void DOMNODE::AddText(PGLOBAL g, PCSZ txtp)
/******************************************************************/ /******************************************************************/
void DOMNODE::DeleteChild(PGLOBAL g, PXNODE dnp) void DOMNODE::DeleteChild(PGLOBAL g, PXNODE dnp)
{ {
TestHr(g, Nodep->removeChild(((PDOMNODE)dnp)->Nodep)); Nodep->removeChild(((PDOMNODE)dnp)->Nodep);
// ((PDOMNODE)dnp)->Nodep->Release(); bad idea, causes a crash // ((PDOMNODE)dnp)->Nodep->Release(); bad idea, causes a crash
Delete(dnp); Delete(dnp);
} // end of DeleteChild } // end of DeleteChild