Index: ext/libicpf/libicpf.vc80.sln =================================================================== diff -u -N --- ext/libicpf/libicpf.vc80.sln (revision 1a71363f6679df9b2f5bf9d6c77b12198f362da6) +++ ext/libicpf/libicpf.vc80.sln (revision 0) @@ -1,25 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libicpf", "libicpf.vc80.vcproj", "{5510B933-046F-4F75-8B46-5E8279C8CCDE}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Debug|Win32.ActiveCfg = Debug|Win32 - {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Debug|Win32.Build.0 = Debug|Win32 - {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Debug|x64.ActiveCfg = Debug|x64 - {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Debug|x64.Build.0 = Debug|x64 - {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Release|Win32.ActiveCfg = Release|Win32 - {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Release|Win32.Build.0 = Release|Win32 - {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Release|x64.ActiveCfg = Release|x64 - {5510B933-046F-4F75-8B46-5E8279C8CCDE}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal Index: ext/libicpf/libicpf.vc81.sln =================================================================== diff -u -N --- ext/libicpf/libicpf.vc81.sln (revision 0) +++ ext/libicpf/libicpf.vc81.sln (revision ea1d52b4f82729e45b3b6683df8341edcd9f7348) @@ -0,0 +1,28 @@ +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libicpf", "libicpf.vc81.vcproj", "{AA9F2D67-CBB7-4062-A29B-119677DEB039}" +EndProject +Global + GlobalSection(DPCodeReviewSolutionGUID) = preSolution + DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} + EndGlobalSection + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug-Unicode|Win32 = Debug-Unicode|Win32 + Release|Win32 = Release|Win32 + Release-Unicode|Win32 = Release-Unicode|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {AA9F2D67-CBB7-4062-A29B-119677DEB039}.Debug|Win32.ActiveCfg = Debug|Win32 + {AA9F2D67-CBB7-4062-A29B-119677DEB039}.Debug|Win32.Build.0 = Debug|Win32 + {AA9F2D67-CBB7-4062-A29B-119677DEB039}.Debug-Unicode|Win32.ActiveCfg = Debug-Unicode|Win32 + {AA9F2D67-CBB7-4062-A29B-119677DEB039}.Debug-Unicode|Win32.Build.0 = Debug-Unicode|Win32 + {AA9F2D67-CBB7-4062-A29B-119677DEB039}.Release|Win32.ActiveCfg = Release|Win32 + {AA9F2D67-CBB7-4062-A29B-119677DEB039}.Release|Win32.Build.0 = Release|Win32 + {AA9F2D67-CBB7-4062-A29B-119677DEB039}.Release-Unicode|Win32.ActiveCfg = Release-Unicode|Win32 + {AA9F2D67-CBB7-4062-A29B-119677DEB039}.Release-Unicode|Win32.Build.0 = Release-Unicode|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Index: ext/libicpf/libicpf.vc81.vcproj =================================================================== diff -u -N --- ext/libicpf/libicpf.vc81.vcproj (revision 0) +++ ext/libicpf/libicpf.vc81.vcproj (revision ea1d52b4f82729e45b3b6683df8341edcd9f7348) @@ -0,0 +1,489 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: ext/libicpf/libicpf.vc80.vcproj =================================================================== diff -u -N --- ext/libicpf/libicpf.vc80.vcproj (revision 1a71363f6679df9b2f5bf9d6c77b12198f362da6) +++ ext/libicpf/libicpf.vc80.vcproj (revision 0) @@ -1,524 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: ext/libicpf/src/cfg_xml.cpp =================================================================== diff -u -N -r6dae57f5e7aeeb965bc018024d8360069f6e15c1 -rea1d52b4f82729e45b3b6683df8341edcd9f7348 --- ext/libicpf/src/cfg_xml.cpp (.../cfg_xml.cpp) (revision 6dae57f5e7aeeb965bc018024d8360069f6e15c1) +++ ext/libicpf/src/cfg_xml.cpp (.../cfg_xml.cpp) (revision ea1d52b4f82729e45b3b6683df8341edcd9f7348) @@ -1,70 +1,70 @@ -#include "cfg_xml.h" -#include -#include "exception.h" -#include -#include -#include - -BEGIN_ICPF_NAMESPACE - -/// Buffer size for reading xml data from a file -#define XML_BUFFER 65536 - -/// Definition of a standard string depending on the unicode support -#ifdef _UNICODE - #define tstring std::wstring -#else - #define tstring std::string -#endif - -// forward declaration -class xml_node; - -/// Xml node storage -typedef std::map xml_storage; -/// String storage (key(s)=>value(s)) -typedef std::multimap attr_storage; - -/** Class manages a single xml node. - */ -class xml_node -{ -public: -/** \name Construction/destruction */ -/**@{*/ - /// Standard constructor - xml_node() : m_mNodes(), m_mAttr(), m_pParentNode(NULL) { }; - /// Constructor defining the parent node - xml_node(xml_node* pParentNode) : m_mNodes(), m_mAttr(), m_pParentNode(pParentNode) { }; -/**@}*/ - -public: - xml_storage m_mNodes; ///< Additional nodes inside of this one - attr_storage m_mAttr; ///< String pairs belonging to this node - xml_node* m_pParentNode; ///< Parent node -}; - -/** State structure - used by expat notifications. - */ -struct XMLSTATE -{ - xml_cfg* pCfg; - xml_node* pNode; -}; +#include "cfg_xml.h" +#include +#include "exception.h" +#include +#include +#include +BEGIN_ICPF_NAMESPACE + +/// Buffer size for reading xml data from a file +#define XML_BUFFER 65536 + +/// Definition of a standard string depending on the unicode support +#ifdef _UNICODE + #define tstring std::wstring +#else + #define tstring std::string +#endif + +// forward declaration +class xml_node; + +/// Xml node storage +typedef std::map xml_storage; +/// String storage (key(s)=>value(s)) +typedef std::multimap attr_storage; + +/** Class manages a single xml node. + */ +class xml_node +{ +public: +/** \name Construction/destruction */ +/**@{*/ + /// Standard constructor + xml_node() : m_mNodes(), m_mAttr(), m_pParentNode(NULL) { }; + /// Constructor defining the parent node + xml_node(xml_node* pParentNode) : m_mNodes(), m_mAttr(), m_pParentNode(pParentNode) { }; +/**@}*/ + +public: + xml_storage m_mNodes; ///< Additional nodes inside of this one + attr_storage m_mAttr; ///< String pairs belonging to this node + xml_node* m_pParentNode; ///< Parent node +}; + +/** State structure - used by expat notifications. + */ +struct XMLSTATE +{ + xml_cfg* pCfg; + xml_node* pNode; +}; + /** Xml find handle structure - used for searching. */ struct XMLFINDHANDLE { attr_storage::iterator it; ///< Iterator of currently retrieved string attr_storage::iterator itEnd; ///< Iterator of a last string matching the criteria }; - -/// Macro for faster access to the xml storage -#define m_pStorage ((xml_storage*)m_hStorage) - -/** Constructs the xml_cfg object. - */ + +/// Macro for faster access to the xml storage +#define m_pStorage ((xml_storage*)m_hStorage) + +/** Constructs the xml_cfg object. + */ xml_cfg::xml_cfg() : m_hStorage((ptr_t)new xml_storage) { @@ -362,4 +362,4 @@ } } -END_ICPF_NAMESPACE +END_ICPF_NAMESPACE Index: ext/libicpf/src/dumpctx.cpp =================================================================== diff -u -N -r6dae57f5e7aeeb965bc018024d8360069f6e15c1 -rea1d52b4f82729e45b3b6683df8341edcd9f7348 --- ext/libicpf/src/dumpctx.cpp (.../dumpctx.cpp) (revision 6dae57f5e7aeeb965bc018024d8360069f6e15c1) +++ ext/libicpf/src/dumpctx.cpp (.../dumpctx.cpp) (revision ea1d52b4f82729e45b3b6683df8341edcd9f7348) @@ -36,7 +36,6 @@ dumpctx::dumpctx(uint_t uiType, ptr_t pParam) : m_lock(), m_hBuffer((ptr_t)new tstring_t), - m_szBuffer(), m_uiType(uiType), m_pParam(pParam) { @@ -49,6 +48,7 @@ } else m_pParam=pParam; + m_szBuffer[0]=_t('\0'); } /** Destructor frees the internal data if needed