<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/26d3baeae82f3ef552406bf1dfb42e74f2ca0fc4">https://github.com/macports/macports-ports/commit/26d3baeae82f3ef552406bf1dfb42e74f2ca0fc4</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 26d3baeae82 mariadb-10.3: update to 10.3.39, apply libxml2 fix
</span>26d3baeae82 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 26d3baeae82f3ef552406bf1dfb42e74f2ca0fc4
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Aug 24 17:27:05 2024 +1000
<span style='display:block; white-space:pre;color:#404040;'> mariadb-10.3: update to 10.3.39, apply libxml2 fix
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also switch to building from the official release tarball.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/69428
</span>---
databases/mariadb-10.3/Portfile | 71 +++---------
databases/mariadb-10.3/files/libxml2-const.patch | 131 +++++++++++++++++++++++
2 files changed, 146 insertions(+), 56 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.3/Portfile b/databases/mariadb-10.3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3695fdd6c73..aedd03a381d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +1,30 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup deprecated 1.0
</span> PortGroup legacysupport 1.1
legacysupport.newest_darwin_requires_legacy 10
name mariadb-10.3
set name_mysql ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 10.3.37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 10.3.39
</span> set version_branch [join [lrange [split ${version} .] 0 1] .]
# Please set revision_client and revision_server to 0 if you bump
# version; these can be changed independently for the 2 subports, but
# can be changed at the same time if that's what's required.
set revision_client 0
set revision_server 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+deprecated.eol_version yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories databases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://mariadb.org/
</span> maintainers {michaelld @michaelld} openmaintainer
if {$subport eq $name} {
PortGroup cmake 1.0
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup github 1.0
</span> PortGroup compiler_blacklist_versions 1.0
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +32,6 @@ if {$subport eq $name} {
</span> # https://trac.macports.org/ticket/60805
compiler.blacklist-append {clang < 900}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup MariaDB server ${version} mariadb-
</span> revision ${revision_client}
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,50 +39,12 @@ if {$subport eq $name} {
</span> long_description Mariadb is a fork of the MySQL server, a multi-threaded SQL database.
cmake.out_of_source yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # mariadb-connector-c is a submodule, but because we're not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # cloning into a GIT module in the first place, we can't use the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # git submodule feature. Have to download separately and install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # into the correct location to get this port to work! Which means
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # we need a mariadb-connector-c branch and so forth ... basically
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # replicate what the github PG does but without using it since it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # is not designed to be used for multiple downloads.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set submodule_github_author MariaDB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set submodule_github_project mariadb-connector-c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set submodule_github_branch 7fdb3eab66384a355475704332d11cc1ab82499a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set main_distname ${distname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set main_distfile ${distfiles}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set submodule_distname ${submodule_github_project}-${submodule_github_branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set submodule_distfile ${submodule_distname}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles ${main_distfile}:tagone \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${submodule_distfile}:tagtwo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites ${github.homepage}/archive/${git.branch}:tagone \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://github.com/${submodule_github_author}/${submodule_github_project}/archive/${submodule_github_branch}:tagtwo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums ${main_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c00782dd00e7b1efd49dcc160adeabee1ae35485 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 088402a8cebed2b0af978570c447ad69d008603fcabf6d2ac2266c9c045d1676 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 64159394 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${submodule_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c63e8387fa7bf3f2d6d4d7db87835f01875fcccf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 37902fbad5b55968e297b071819228a0b58f253d82d2813f249a7ba230d71019 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1191573
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir ${github.project}-${git.branch}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # put the submodule_github_project directory into position
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove the original directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "delete ${worksrcpath}/libmariadb"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${worksrcpath}/libmariadb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "move ${workpath}/${submodule_distname} ${worksrcpath}/libmariadb"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${workpath}/${submodule_distname} ${worksrcpath}/libmariadb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites https://downloads.mariadb.org/rest-api/mariadb/${version}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname mariadb-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 01507b5fa807618b4c5e5281812ff8f6cc83ddfe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 18bd51c847565af4da18748b052ab9bcbb569ab6e6766ca8da7dcca1f941f876 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 74469177
</span>
depends_lib-append port:zlib port:tcp_wrappers port:ncurses port:judy \
port:openssl11 port:libxml2 port:pcre
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,7 +66,8 @@ if {$subport eq $name} {
</span> patch-libmariadb_cmake_install.cmake.diff \
patch-libmariadb_libmariadb_CMakeLists.txt.diff \
patch-cmake_mysql_version.cmake.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-SSL_INCLUDES_first.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-SSL_INCLUDES_first.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libxml2-const.patch
</span>
# patch to provide minimum changes required for ARM64 support;
# guessing this will be fixed in the next release.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -226,16 +190,13 @@ directive; to disable networking. With disabled networking it is
</span> possible to install and have running all the MacPorts mysql ports
simultaneously.
"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.livecheck.regex (${version_branch}\\.\[0-9\]+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
subport ${name_mysql}-server {
revision ${revision_server}
license BSD
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description (Beta version) Run ${name_mysql} as server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Run ${name_mysql} as server
</span> long_description {*}${description}
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -297,8 +258,6 @@ If this is a new install you might want to run:
</span>
\$ sudo -u ${mysqluser} ${prefix}/lib/${name_mysql}/bin/mysql_install_db
"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://mariadb.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type none
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.3/files/libxml2-const.patch b/databases/mariadb-10.3/files/libxml2-const.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2759856ef74
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.3/files/libxml2-const.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,131 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/MariaDB/server/commit/cae18632ae
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/storage/connect/libdoc.cpp b/storage/connect/libdoc.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 14e1e44895c80..01b38366d635a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/storage/connect/libdoc.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/storage/connect/libdoc.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,7 +93,6 @@ class LIBXMLDOC : public XMLDOCUMENT {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xmlXPathContextPtr Ctxp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xmlXPathObjectPtr Xop;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xmlXPathObjectPtr NlXop;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xmlErrorPtr Xerr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *Buf; // Temporary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool Nofreelist;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }; // end of class LIBXMLDOC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -327,7 +326,6 @@ LIBXMLDOC::LIBXMLDOC(char *nsl, char *nsdf, char *enc, PFBLOCK fp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Ctxp = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Xop = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NlXop = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Xerr = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Buf = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Nofreelist = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } // end of LIBXMLDOC constructor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -365,8 +363,8 @@ bool LIBXMLDOC::ParseFile(PGLOBAL g, char *fn)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Encoding = (char*)Docp->encoding;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } else if ((Xerr = xmlGetLastError()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xmlResetError(Xerr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else if (xmlGetLastError())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xmlResetLastError();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } // end of ParseFile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -505,9 +503,9 @@ int LIBXMLDOC::DumpDoc(PGLOBAL g, char *ofn)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // This function does not crash (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (xmlSaveFormatFileEnc((const char *)ofn, Docp, Encoding, 0) < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xmlErrorPtr err = xmlGetLastError();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const xmlError *err = xmlGetLastError();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcpy(g->Message, (err) ? err->message : "Error saving XML doc");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xmlResetError(Xerr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xmlResetLastError();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rc = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } // endif Save
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // rc = xmlDocDump(of, Docp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -546,8 +544,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Nlist) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xmlXPathFreeNodeSet(Nlist);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((Xerr = xmlGetLastError()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xmlResetError(Xerr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (xmlGetLastError())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xmlResetLastError();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Nlist = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } // endif Nlist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -555,8 +553,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Xop) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xmlXPathFreeObject(Xop);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((Xerr = xmlGetLastError()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xmlResetError(Xerr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (xmlGetLastError())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xmlResetLastError();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Xop = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } // endif Xop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -564,8 +562,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (NlXop) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xmlXPathFreeObject(NlXop);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((Xerr = xmlGetLastError()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xmlResetError(Xerr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (xmlGetLastError())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xmlResetLastError();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NlXop = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } // endif NlXop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -573,8 +571,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Ctxp) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xmlXPathFreeContext(Ctxp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((Xerr = xmlGetLastError()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xmlResetError(Xerr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (xmlGetLastError())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xmlResetLastError();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Ctxp = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } // endif Ctxp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -590,6 +588,7 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /******************************************************************/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xmlNodeSetPtr LIBXMLDOC::GetNodeList(PGLOBAL g, xmlNodePtr np, char *xp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const xmlError *xerr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xmlNodeSetPtr nl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (trace(1))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -649,11 +648,11 @@ xmlNodeSetPtr LIBXMLDOC::GetNodeList(PGLOBAL g, xmlNodePtr np, char *xp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xmlXPathFreeObject(Xop); // Caused node not found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((Xerr = xmlGetLastError())) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- strcpy(g->Message, Xerr->message);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xmlResetError(Xerr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((xerr = xmlGetLastError())) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strcpy(g->Message, xerr->message);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xmlResetLastError();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } // endif Xerr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } // endif xerr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } // endif Xop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1079,7 +1078,7 @@ void XML2NODE::AddText(PGLOBAL g, PCSZ txtp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /******************************************************************/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void XML2NODE::DeleteChild(PGLOBAL g, PXNODE dnp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xmlErrorPtr xerr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const xmlError *xerr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (trace(1))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ htrc("DeleteChild: node=%p\n", dnp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1122,7 +1121,7 @@ void XML2NODE::DeleteChild(PGLOBAL g, PXNODE dnp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (trace(1))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ htrc("DeleteChild: errmsg=%-.256s\n", xerr->message);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xmlResetError(xerr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xmlResetLastError();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } // end of DeleteChild
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* -------------------- class XML2NODELIST ---------------------- */
</span></pre><pre style='margin:0'>
</pre>