mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
2>libdoc.cpp
2>D:\CommonSource\mariadb-10.0\include\my_pthread.h(120) : warning C4005: '_REENTRANT' : redéfinition de macro 2> D:\Libxml\include\libxml/xmlexports.h(77) : voir la définition précédente de '_REENTRANT' 2>.\libdoc.cpp(378) : error C2664: 'strlen' : impossible de convertir le paramètre 1 de 'xmlChar *' en 'const char *' 2> Les types pointés n'ont aucun rapport entre eux ; conversion nécessitant reinterpret_cast, cast de style C ou cast de style fonction 2>.\libdoc.cpp(379) : error C2664: 'copy_and_convert' : impossible de convertir le paramètre 4 de 'xmlChar *' en 'const char *' 2> Les types pointés n'ont aucun rapport entre eux ; conversion nécessitant reinterpret_cast, cast de style C ou cast de style fonction 2> Fix for that.
This commit is contained in:
@@ -904,22 +904,25 @@ int TDBXML::DeleteDB(PGLOBAL g, int irc)
|
||||
/***********************************************************************/
|
||||
void TDBXML::CloseDB(PGLOBAL g)
|
||||
{
|
||||
if (Changed) {
|
||||
char filename[_MAX_PATH];
|
||||
// PDBUSER dup = (PDBUSER)g->Activityp->Aptr;
|
||||
if (Docp) {
|
||||
if (Changed) {
|
||||
char filename[_MAX_PATH];
|
||||
// PDBUSER dup = (PDBUSER)g->Activityp->Aptr;
|
||||
|
||||
// We used the file name relative to recorded datapath
|
||||
PlugSetPath(filename, Xfile, GetPath());
|
||||
// We used the file name relative to recorded datapath
|
||||
PlugSetPath(filename, Xfile, GetPath());
|
||||
|
||||
if (Mode == MODE_INSERT)
|
||||
TabNode->AddText(g, "\n");
|
||||
if (Mode == MODE_INSERT)
|
||||
TabNode->AddText(g, "\n");
|
||||
|
||||
// Save the modified document
|
||||
int rc = Docp->DumpDoc(g, filename);
|
||||
} // endif Changed
|
||||
// Save the modified document
|
||||
int rc = Docp->DumpDoc(g, filename);
|
||||
} // endif Changed
|
||||
|
||||
// Free the document and terminate XML processing
|
||||
Docp->CloseDoc(g, To_Xb);
|
||||
} // endif docp
|
||||
|
||||
// Free the document and terminate XML processing
|
||||
Docp->CloseDoc(g, To_Xb);
|
||||
} // end of CloseDB
|
||||
|
||||
// ------------------------ XMLCOL functions ----------------------------
|
||||
|
Reference in New Issue
Block a user