aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-12-12 04:04:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: Put libxml code in .cpp (it was a hack for libwww, that is not used anymore...)

Browse source
This commit is contained in:
kervala 2016-01-26 22:41:58 +01:00
parent 977017ecf0
commit 7a37ecae16
2 changed files with 53 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
code/nel/include/nel/misc/xml_auto_ptr.h
View file

@ -19,6 +19,9 @@
#ifndef XML_AUTO_PTR_H #ifndef XML_AUTO_PTR_H
#define XML_AUTO_PTR_H #define XML_AUTO_PTR_H
#include "nel/misc/types_nl.h"
#include "nel/misc/debug.h"
#include <string> #include <string>
/** Simple auto pointer for xml pointers /** Simple auto pointer for xml pointers
@ -28,7 +31,7 @@ class CXMLAutoPtr
public: public:
CXMLAutoPtr(const char *value = NULL) : _Value(value) {} CXMLAutoPtr(const char *value = NULL) : _Value(value) {}
CXMLAutoPtr(const unsigned char *value) : _Value((const char *) value) {} CXMLAutoPtr(const unsigned char *value) : _Value((const char *) value) {}
~CXMLAutoPtr() { destroy(); } ~CXMLAutoPtr();
operator const char *() const { return _Value; } operator const char *() const { return _Value; }
operator bool() const { return _Value != NULL; } operator bool() const { return _Value != NULL; }
inline std::string str() const { return _Value; } inline std::string str() const { return _Value; }
@ -36,13 +39,7 @@ public:
operator const unsigned char *() const { return (const unsigned char *) _Value; } operator const unsigned char *() const { return (const unsigned char *) _Value; }
char operator * () const { nlassert(_Value); return *_Value; } char operator * () const { nlassert(_Value); return *_Value; }
/// NB : This remove previous owned pointer with xmlFree /// NB : This remove previous owned pointer with xmlFree
CXMLAutoPtr &operator = (const char *other) CXMLAutoPtr &operator = (const char *other);
{
if (other == _Value) return *this;
destroy();
_Value = other;
return *this;
}
CXMLAutoPtr &operator = (const unsigned char *other) CXMLAutoPtr &operator = (const unsigned char *other)
{ {
@ -54,14 +51,7 @@ public:
private: private:
const char *_Value; const char *_Value;
private: private:
void destroy() void destroy();
{
if (_Value)
{
xmlFree(const_cast<char *>(_Value));
_Value = NULL;
}
}
// We'd rather avoid problems // We'd rather avoid problems
CXMLAutoPtr(const CXMLAutoPtr &/* other */) CXMLAutoPtr(const CXMLAutoPtr &/* other */)

47
code/nel/src/misc/xml_auto_ptr.cpp Normal file
View file

@ -0,0 +1,47 @@
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
// Copyright (C) 2010 Winch Gate Property Limited
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "stdmisc.h"
#include "nel/misc/xml_auto_ptr.h"
#include <libxml/parser.h>
//=======================================
void CXMLAutoPtr::destroy()
{
if (_Value)
{
xmlFree(const_cast<char *>(_Value));
_Value = NULL;
}
}
//=======================================
CXMLAutoPtr::~CXMLAutoPtr()
{
destroy();
}
//=======================================
CXMLAutoPtr &CXMLAutoPtr::operator = (const char *other)
{
if (other == _Value) return *this;
destroy();
_Value = other;
return *this;
}