Request 284 (accepted)

Overview

Request 284 (accepted)

bump version 0.4.28

Created by marguerite over 11 years ago
In state accepted

Submit libzen

Submit package home:marguerite:...ches:Multimedia / libzen to package Multimedia / libzen

libzen.changes Changed

libzen.spec Changed

@@ -8,15 +8,18 @@
 %define soname	0
 
 Name:           libzen
-Version:        0.4.22
+Version:        0.4.28
 Release:        0.pm.1
 Summary:        Shared library for mediainfo
 Group:          System/Libraries
-License:        BSD
+License:        BSD-3-Clause
 URL:            http://zenlib.sourceforge.net/
 Source:         http://prdownloads.sourceforge.net/zenlib/libzen_%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:  autoconf automake libtool
+BuildRequires:  autoconf 
+BuildRequires:  automake 
+BuildRequires:  fdupes
+BuildRequires:  libtool
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
@@ -74,7 +77,7 @@
 %__install -dm 755 %{buildroot}%{_includedir}/ZenLib
 %__install -m 644 Source/ZenLib/*.h \
     %{buildroot}%{_includedir}/ZenLib
-for i in Base64 HTTP_Client Format/Html Format/Http TinyXml; do
+for i in HTTP_Client Format/Html Format/Http; do
     %__install -dm 755 %{buildroot}%{_includedir}/ZenLib/$i
     %__install -m 644 Source/ZenLib/$i/*.h \
     	%{buildroot}%{_includedir}/ZenLib/$i
@@ -89,6 +92,11 @@
 %__rm %{buildroot}%{_libdir}/libzen.a
 %__rm %{buildroot}%{_libdir}/libzen.la
 
+# we don't need libzen-config
+rm %{buildroot}%{_bindir}/libzen-config
+
+%fdupes %{buildroot}
+
 %clean
 %{?buildroot:%__rm -rf "%{buildroot}"}
 
@@ -110,4 +118,4 @@
 %{_libdir}/libzen.so
 %{_libdir}/pkgconfig/*.pc
 
-%changelog
+%changelog
\ No newline at end of file

libzen_0.4.22.tar.bz2/Project/GNU/libzen_contrib.spec Deleted

@@ -1,127 +0,0 @@
-
-%define _prefix	/usr
-%define _SO_nr	0
-
-Name:		libzen%{_SO_nr}
-Version:	0.4.22
-Release:	%mkrel 1
-Summary:	Shared library for mediainfo
-Summary(de):	Benötigte Bibliothek für MediaInfo
-Group:		System/Libraries
-License:	BSD
-URL:		http://zenlib.sourceforge.net/
-Source:		libzen_%{version}.tar.bz2
-Source90:	libzen-rpmlintrc
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:	dos2unix
-BuildRequires:	doxygen
-BuildRequires:	gcc-c++
-Requires: glibc >= 2.10.1
-Requires: libstdc++6 >= 4.4.1
-Obsoletes:	%name < %version
-
-%description
-Shared library for libmediainfo and medianfo-gui.
-
-#german
-%description -l de
-Benötigte Bibliothek für libmediainfo und MediaINFO-GUI.
-
-
-%package -n libzen-devel
-Summary:	Include files and libraries for development
-Summary(de):	Include Dateien und Bibliotheken für die Entwicklung
-Group:		Development/Libraries/C and C++
-Requires:	libzen%{_SO_nr} = %{version}
-
-%description -n libzen-devel
-Include files and mandatory libraries for development.
-
-#german
-%description -n libzen-devel -l de
-Include Dateien und benötigte Bibliotheken für die Entwicklung.
-
-
-%prep
-%setup -q -n ZenLib
-dos2unix *.txt Source/Doc/*.html
-%__chmod 644 *.txt Source/Doc/*.html
-
-%build
-# generate docs
-pushd Source/Doc
-	doxygen -u 2> /dev/null
-	doxygen Doxyfile
-popd
-
-export CFLAGS="$RPM_OPT_FLAGS"
-export CPPFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
-
-pushd Project/GNU/Library
-	%__chmod +x autogen
-	./autogen
-	%configure \
-		--enable-shared
-
-	%__make clean
-	%__make %{?jobs:-j%{jobs}}
-popd
-
-%install
-pushd Project/GNU/Library
-	%makeinstall
-popd
-
-# Zenlib headers and ZenLib-config
-%__install -dm 755 %{buildroot}%{_includedir}/ZenLib
-%__install -m 644 Source/ZenLib/*.h \
-	%{buildroot}%{_includedir}/ZenLib
-for i in Base64 HTTP_Client; do
-	%__install -dm 755 %{buildroot}%{_includedir}/ZenLib/$i
-	%__install -m 644 Source/ZenLib/$i/*.h \
-		%{buildroot}%{_includedir}/ZenLib/$i
-done
-
-%__sed -i -e 's|Version: |Version: %{version}|g' \
-	Project/GNU/Library/libzen.pc
-%__install -dm 755 %{buildroot}%{_libdir}/pkgconfig
-%__install -m 644 Project/GNU/Library/libzen.pc \
-	%{buildroot}%{_libdir}/pkgconfig
-
-%__rm %{buildroot}%{_libdir}/libzen.la
-
-%clean
- -d "%{buildroot}" -a "%{buildroot}" != "" && %__rm -rf "%{buildroot}"
-
-%post -n libzen%{_SO_nr} -p /sbin/ldconfig
-
-%postun -n libzen%{_SO_nr} -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%doc *.txt
-%{_libdir}/libzen.so.*
-
-%files -n libzen-devel
-%defattr(-,root,root,-)
-%doc Source/Doc/Documentation.html
-%doc Doc/*
-%dir %{_includedir}/ZenLib
-%{_includedir}/ZenLib/*
-%{_libdir}/libzen.a
-%{_libdir}/libzen.so
-%{_libdir}/pkgconfig/*.pc
-
-%changelog
-* Wed Jan 06 2010 leiche >MeissSW01 at aol.com> 0.4.13-1pclos2010
-- 0.4.13
-
-* Fri Nov 13 2009 Leiche <MeissSW01 at aol.com> 0.4.9-1pclos2010
-- 0.4.9
-
-* Fri Sep 11 2009 slick50 <lxgator@gmail.com> 0.4.3-1pclos2009
-- 0.4.3
-
-* Mon Jun 01 2009 Texstar <texstar@gmail.com> 0.4.2-1pclos2009
-- import from Toni Graffy

libzen_0.4.22.tar.bz2/Project/MSVC2008/Library/ZenLib.vcxproj Deleted

@@ -1,372 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="DebugA|Win32">
- <Configuration>DebugA</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="DebugA|x64">
- <Configuration>DebugA</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="ReleaseA|Win32">
- <Configuration>ReleaseA</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="ReleaseA|x64">
- <Configuration>ReleaseA</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}</ProjectGuid>
- <RootNamespace>ZenLib</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\Intermediate\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\Intermediate\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">$(Platform)\$(Configuration)\Intermediate\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">$(Platform)\$(Configuration)\Intermediate\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\Intermediate\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\Intermediate\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">$(Platform)\$(Configuration)\Intermediate\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'">$(Platform)\$(Configuration)\Intermediate\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <AdditionalOptions>/MP /analyze %(AdditionalOptions)</AdditionalOptions>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../Source;../../../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level4</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Lib>
- <OutputFile>$(OutDir)ZenLib.lib</OutputFile>
- </Lib>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>../../../Source;../../../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level4</WarningLevel>
- </ClCompile>
- <Lib>
- <OutputFile>$(OutDir)ZenLib.lib</OutputFile>
- </Lib>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">
- <ClCompile>
- <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>../../../Source;../../../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level4</WarningLevel>
- </ClCompile>
- <Lib>
- <OutputFile>$(OutDir)ZenLib.lib</OutputFile>
- </Lib>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">
- <ClCompile>
- <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../Source;../../../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level4</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <EnablePREfast>true</EnablePREfast>
- </ClCompile>
- <Lib>
- <OutputFile>$(OutDir)ZenLib.lib</OutputFile>
- </Lib>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../Source;../../../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;WSTRING_MISSING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level4</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <EnablePREfast>true</EnablePREfast>
- </ClCompile>
- <Lib>
- <OutputFile>$(OutDir)ZenLib.lib</OutputFile>
- </Lib>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>../../../Source;../../../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level4</WarningLevel>
- </ClCompile>
- <Lib>
- <OutputFile>$(OutDir)ZenLib.lib</OutputFile>
- </Lib>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>../../../Source;../../../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level4</WarningLevel>
- </ClCompile>
- <Lib>
- <OutputFile>$(OutDir)ZenLib.lib</OutputFile>
- </Lib>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../Source;../../../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level4</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <EnablePREfast>true</EnablePREfast>
- </ClCompile>
- <Lib>
- <OutputFile>$(OutDir)ZenLib.lib</OutputFile>
- </Lib>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\..\Source\ZenLib\Conf.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\CriticalSection.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\Dir.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\File.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\FileName.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\HTTP_Client.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\InfoMap.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\int128s.cpp">
- <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\int128u.cpp">
- <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\MemoryDebug.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\OS_Utils.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\Thread.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\Translation.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\Utils.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\Ztring.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\ZtringList.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\ZtringListList.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\ZtringListListF.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\Format\Http\Http_Cookies.cpp">
- <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'">4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\Format\Http\Http_Handler.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\Format\Http\Http_Request.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\Format\Http\Http_Utils.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\Format\Html\Html_Handler.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\Format\Html\Html_Request.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\TinyXml\tinyxml.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\TinyXml\tinyxmlerror.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\TinyXml\tinyxmlparser.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\..\Source\ZenLib\BitStream.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\BitStream_LE.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\Conf.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\CriticalSection.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\Dir.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\File.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\FileName.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\HTTP_Client.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\InfoMap.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\int128s.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\int128u.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\MemoryDebug.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\OS_Utils.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\Thread.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\Trace.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\Translation.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\Utils.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\Ztring.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\ZtringList.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\ZtringListList.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\ZtringListListF.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\Format\Html\Html_Handler.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\Format\Html\Html_Request.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\Format\Http\Http_Cookies.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\Format\Http\Http_Handler.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\Format\Http\Http_Request.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\Format\Http\Http_Utils.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\TinyXml\tinyxml.h" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

libzen_0.4.22.tar.bz2/Project/MSVC2008/Library/ZenLib.vcxproj.filters Deleted

@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Source Files\Format">
- <UniqueIdentifier>{1938e9d3-ba2a-47fd-8dc3-3a3ccecaa0d6}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\Format\Http">
- <UniqueIdentifier>{1e84186a-d16e-48b4-8e0c-d41adb7406a4}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\Format\Html">
- <UniqueIdentifier>{f0b43139-a38c-4518-8cea-e8869d52b7db}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\TinyXml">
- <UniqueIdentifier>{4db0cc83-c949-4a48-83b1-9d340060886f}</UniqueIdentifier>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Header Files\Format">
- <UniqueIdentifier>{598dd8c5-63a8-48fa-8494-11499329f889}</UniqueIdentifier>
- </Filter>
- <Filter Include="Header Files\Format\Html">
- <UniqueIdentifier>{2654d01e-f26e-4f1c-9c38-b4ce7f344a4c}</UniqueIdentifier>
- </Filter>
- <Filter Include="Header Files\Format\Http">
- <UniqueIdentifier>{108e3b26-d5d7-4d99-8664-ddade5b4ce49}</UniqueIdentifier>
- </Filter>
- <Filter Include="Header Files\TinyXml">
- <UniqueIdentifier>{c9d897f3-0abb-4fb1-a359-9b9936969d3d}</UniqueIdentifier>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\..\Source\ZenLib\Conf.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\CriticalSection.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\Dir.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\File.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\FileName.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\HTTP_Client.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\InfoMap.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\int128s.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\int128u.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\MemoryDebug.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\OS_Utils.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\Thread.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\Translation.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\Utils.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\Ztring.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\ZtringList.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\ZtringListList.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\ZtringListListF.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\Format\Http\Http_Cookies.cpp">
- <Filter>Source Files\Format\Http</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\Format\Http\Http_Handler.cpp">
- <Filter>Source Files\Format\Http</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\Format\Http\Http_Request.cpp">
- <Filter>Source Files\Format\Http</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\Format\Http\Http_Utils.cpp">
- <Filter>Source Files\Format\Http</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\Format\Html\Html_Handler.cpp">
- <Filter>Source Files\Format\Html</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\Format\Html\Html_Request.cpp">
- <Filter>Source Files\Format\Html</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\TinyXml\tinyxml.cpp">
- <Filter>Source Files\TinyXml</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\TinyXml\tinyxmlerror.cpp">
- <Filter>Source Files\TinyXml</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\TinyXml\tinyxmlparser.cpp">
- <Filter>Source Files\TinyXml</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\..\Source\ZenLib\BitStream.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\BitStream_LE.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\Conf.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\CriticalSection.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\Dir.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\File.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\FileName.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\HTTP_Client.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\InfoMap.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\int128s.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\int128u.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\MemoryDebug.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\OS_Utils.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\Thread.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\Trace.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\Translation.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\Utils.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\Ztring.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\ZtringList.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\ZtringListList.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\ZtringListListF.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\Format\Html\Html_Handler.h">
- <Filter>Header Files\Format\Html</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\Format\Html\Html_Request.h">
- <Filter>Header Files\Format\Html</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\Format\Http\Http_Cookies.h">
- <Filter>Header Files\Format\Http</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\Format\Http\Http_Handler.h">
- <Filter>Header Files\Format\Http</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\Format\Http\Http_Request.h">
- <Filter>Header Files\Format\Http</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\Format\Http\Http_Utils.h">
- <Filter>Header Files\Format\Http</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\TinyXml\tinyxml.h">
- <Filter>Header Files\TinyXml</Filter>
- </ClInclude>
- </ItemGroup>
-</Project>
\ No newline at end of file

libzen_0.4.22.tar.bz2/Source/ZenLib/Base64 Deleted

libzen_0.4.22.tar.bz2/Source/ZenLib/Base64/base64.h Deleted

@@ -1,158 +0,0 @@
-// &#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f; //
-// &#x7f;#### ### ## -= Base64 library =- &#x7f; //
-// &#x7f;# # # # # Base64.h - Base64 encoder/decoder &#x7f; //
-// &#x7f;#### #### # # &#x7f; //
-// &#x7f;# # # # ##### Encodes and decodes base64 strings &#x7f; //
-// &#x7f;# # # # # Ideas taken from work done by Bob Withers &#x7f; //
-// &#x7f;#### ### # R1 2002-05-07 by Markus Ewald &#x7f; //
-// &#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f; //
-#ifndef B64_BASE64_H
-#define B64_BASE64_H
-
-#include <string>
-
-namespace Base64 {
-
- /// Encode string to base64
- inline std::string encode(const std::string &sString);
- /// Encode base64 into string
- inline std::string decode(const std::string &sString);
-
-}; // namespace Base64
-
-// ####################################################################### //
-// # Base64::encode() # //
-// ####################################################################### //
-/** Encodes the specified string to base64
-
- @param sString String to encode
- @return Base64 encoded string
-*/
-inline std::string Base64::encode(const std::string &sString) {
- static const std::string sBase64Table(
- // 0000000000111111111122222222223333333333444444444455555555556666
- // 0123456789012345678901234567890123456789012345678901234567890123
- "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
- );
- static const char cFillChar = '=';
- std::string::size_type nLength = sString.length();
- std::string sResult;
-
- // Allocate memory for the converted string
- sResult.reserve(nLength * 8 / 6 + 1);
-
- for(std::string::size_type nPos = 0; nPos < nLength; nPos++) {
- char cCode;
- 
- // Encode the first 6 bits
- cCode = (sStringnPos >> 2) & 0x3f;
- sResult.append(1, sBase64TablecCode);
-
- // Encode the remaining 2 bits with the next 4 bits (if present)
- cCode = (sStringnPos << 4) & 0x3f;
- if(++nPos < nLength)
- cCode |= (sStringnPos >> 4) & 0x0f;
- sResult.append(1, sBase64TablecCode);
-
- if(nPos < nLength) {
- cCode = (sStringnPos << 2) & 0x3f;
- if(++nPos < nLength)
- cCode |= (sStringnPos >> 6) & 0x03;
-
- sResult.append(1, sBase64TablecCode);
- } else {
- ++nPos;
- sResult.append(1, cFillChar);
- }
-
- if(nPos < nLength) {
- cCode = sStringnPos & 0x3f;
- sResult.append(1, sBase64TablecCode);
- } else {
- sResult.append(1, cFillChar);
- }
- }
-
- return sResult;
-}
-
-// ####################################################################### //
-// # Base64::decode() # //
-// ####################################################################### //
-/** Decodes the specified base64 string
-
- @param sString Base64 string to decode
- @return Decoded string
-*/
-inline std::string Base64::decode(const std::string &sString) {
- static const std::string::size_type np = std::string::npos;
- static const std::string::size_type DecodeTable = {
- // 0 1 2 3 4 5 6 7 8 9 
- np, np, np, np, np, np, np, np, np, np, // 0 - 9
- np, np, np, np, np, np, np, np, np, np, // 10 - 19
- np, np, np, np, np, np, np, np, np, np, // 20 - 29
- np, np, np, np, np, np, np, np, np, np, // 30 - 39
- np, np, np, 62, np, np, np, 63, 52, 53, // 40 - 49
- 54, 55, 56, 57, 58, 59, 60, 61, np, np, // 50 - 59
- np, np, np, np, np, 0, 1, 2, 3, 4, // 60 - 69
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, // 70 - 79
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, // 80 - 89
- 25, np, np, np, np, np, np, 26, 27, 28, // 90 - 99
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, // 100 - 109
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, // 110 - 119
- 49, 50, 51, np, np, np, np, np, np, np, // 120 - 129
- np, np, np, np, np, np, np, np, np, np, // 130 - 139
- np, np, np, np, np, np, np, np, np, np, // 140 - 149
- np, np, np, np, np, np, np, np, np, np, // 150 - 159
- np, np, np, np, np, np, np, np, np, np, // 160 - 169
- np, np, np, np, np, np, np, np, np, np, // 170 - 179
- np, np, np, np, np, np, np, np, np, np, // 180 - 189
- np, np, np, np, np, np, np, np, np, np, // 190 - 199
- np, np, np, np, np, np, np, np, np, np, // 200 - 209
- np, np, np, np, np, np, np, np, np, np, // 210 - 219
- np, np, np, np, np, np, np, np, np, np, // 220 - 229
- np, np, np, np, np, np, np, np, np, np, // 230 - 239
- np, np, np, np, np, np, np, np, np, np, // 240 - 249
- np, np, np, np, np, np // 250 - 256
- };
- static const char cFillChar = '=';
-
- std::string::size_type nLength = sString.length();
- std::string sResult;
-
- sResult.reserve(nLength);
-
- for(std::string::size_type nPos = 0; nPos < nLength; nPos++) {
- unsigned char c, c1;
-
- c = (char) DecodeTable(unsigned char)sStringnPos;
- nPos++;
- c1 = (char) DecodeTable(unsigned char)sStringnPos;
- c = (c << 2) | ((c1 >> 4) & 0x3);
- sResult.append(1, c);
-
- if(++nPos < nLength) {
- c = sStringnPos;
- if(cFillChar == c)
- break;
-
- c = (char) DecodeTable(unsigned char)sStringnPos;
- c1 = ((c1 << 4) & 0xf0) | ((c >> 2) & 0xf);
- sResult.append(1, c1);
- }
-
- if(++nPos < nLength) {
- c1 = sStringnPos;
- if(cFillChar == c1)
- break;
-
- c1 = (char) DecodeTable(unsigned char)sStringnPos;
- c = ((c << 6) & 0xc0) | c1;
- sResult.append(1, c);
- }
- }
-
- return sResult;
-}
-
-#endif // B64_BASE64_H

libzen_0.4.22.tar.bz2/Source/ZenLib/TinyXml Deleted

libzen_0.4.22.tar.bz2/Source/ZenLib/TinyXml/tinyxml.cpp Deleted

@@ -1,1886 +0,0 @@
-/*
-www.sourceforge.net/projects/tinyxml
-Original code by Lee Thomason (www.grinninglizard.com)
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-*/
-
-#include <ctype.h>
-
-#ifdef TIXML_USE_STL
-#include <sstream>
-#include <iostream>
-#endif
-
-#include "tinyxml.h"
-
-FILE* TiXmlFOpen( const char* filename, const char* mode );
-
-bool TiXmlBase::condenseWhiteSpace = true;
-
-// Microsoft compiler security
-FILE* TiXmlFOpen( const char* filename, const char* mode )
-{
-	#if defined(_MSC_VER) && (_MSC_VER >= 1400 )
-		FILE* fp = 0;
-		errno_t err = fopen_s( &fp, filename, mode );
-		if ( !err && fp )
-			return fp;
-		return 0;
-	#else
-		return fopen( filename, mode );
-	#endif
-}
-
-void TiXmlBase::EncodeString( const TIXML_STRING& str, TIXML_STRING* outString )
-{
-	int i=0;
-
-	while( i<(int)str.length() )
-	{
-		unsigned char c = (unsigned char) stri;
-
-		if ( c == '&' 
-		 && i < ( (int)str.length() - 2 )
-			 && stri+1 == '#'
-			 && stri+2 == 'x' )
-		{
-			// Hexadecimal character reference.
-			// Pass through unchanged.
-			// &#xA9;	-- copyright symbol, for example.
-			//
-			// The -1 is a bug fix from Rob Laveaux. It keeps
-			// an overflow from happening if there is no ';'.
-			// There are actually 2 ways to exit this loop -
-			// while fails (error case) and break (semicolon found).
-			// However, there is no mechanism (currently) for
-			// this function to return an error.
-			while ( i<(int)str.length()-1 )
-			{
-				outString->append( str.c_str() + i, 1 );
-				++i;
-				if ( stri == ';' )
-					break;
-			}
-		}
-		else if ( c == '&' )
-		{
-			outString->append( entity0.str, entity0.strLength );
-			++i;
-		}
-		else if ( c == '<' )
-		{
-			outString->append( entity1.str, entity1.strLength );
-			++i;
-		}
-		else if ( c == '>' )
-		{
-			outString->append( entity2.str, entity2.strLength );
-			++i;
-		}
-		else if ( c == '\"' )
-		{
-			outString->append( entity3.str, entity3.strLength );
-			++i;
-		}
-		else if ( c == '\'' )
-		{
-			outString->append( entity4.str, entity4.strLength );
-			++i;
-		}
-		else if ( c < 32 )
-		{
-			// Easy pass at non-alpha/numeric/symbol
-			// Below 32 is symbolic.
-			char buf 32 ;
-			
-			#if defined(TIXML_SNPRINTF)		
-				TIXML_SNPRINTF( buf, sizeof(buf), "&#x%02X;", (unsigned) ( c & 0xff ) );
-			#else
-				sprintf( buf, "&#x%02X;", (unsigned) ( c & 0xff ) );
-			#endif		
-
-			//*ME:	warning C4267: convert 'size_t' to 'int'
-			//*ME:	Int-Cast to make compiler happy ...
-			outString->append( buf, (int)strlen( buf ) );
-			++i;
-		}
-		else
-		{
-			//char realc = (char) c;
-			//outString->append( &realc, 1 );
-			*outString += (char) c;	// somewhat more efficient function call.
-			++i;
-		}
-	}
-}
-
-
-TiXmlNode::TiXmlNode( NodeType _type ) : TiXmlBase()
-{
-	parent = 0;
-	type = _type;
-	firstChild = 0;
-	lastChild = 0;
-	prev = 0;
-	next = 0;
-}
-
-
-TiXmlNode::~TiXmlNode()
-{
-	TiXmlNode* node = firstChild;
-	TiXmlNode* temp = 0;
-
-	while ( node )
-	{
-		temp = node;
-		node = node->next;
-		delete temp;
-	}	
-}
-
-
-void TiXmlNode::CopyTo( TiXmlNode* target ) const
-{
-	target->SetValue (value.c_str() );
-	target->userData = userData; 
-	target->location = location;
-}
-
-
-void TiXmlNode::Clear()
-{
-	TiXmlNode* node = firstChild;
-	TiXmlNode* temp = 0;
-
-	while ( node )
-	{
-		temp = node;
-		node = node->next;
-		delete temp;
-	}	
-
-	firstChild = 0;
-	lastChild = 0;
-}
-
-
-TiXmlNode* TiXmlNode::LinkEndChild( TiXmlNode* node )
-{
-	assert( node->parent == 0 || node->parent == this );
-	assert( node->GetDocument() == 0 || node->GetDocument() == this->GetDocument() );
-
-	if ( node->Type() == TiXmlNode::TINYXML_DOCUMENT )
-	{
-		delete node;
-		if ( GetDocument() ) 
-			GetDocument()->SetError( TIXML_ERROR_DOCUMENT_TOP_ONLY, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return 0;
-	}
-
-	node->parent = this;
-
-	node->prev = lastChild;
-	node->next = 0;
-
-	if ( lastChild )
-		lastChild->next = node;
-	else
-		firstChild = node;			// it was an empty list.
-
-	lastChild = node;
-	return node;
-}
-
-
-TiXmlNode* TiXmlNode::InsertEndChild( const TiXmlNode& addThis )
-{
-	if ( addThis.Type() == TiXmlNode::TINYXML_DOCUMENT )
-	{
-		if ( GetDocument() ) 
-			GetDocument()->SetError( TIXML_ERROR_DOCUMENT_TOP_ONLY, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return 0;
-	}
-	TiXmlNode* node = addThis.Clone();
-	if ( !node )
-		return 0;
-
-	return LinkEndChild( node );
-}
-
-
-TiXmlNode* TiXmlNode::InsertBeforeChild( TiXmlNode* beforeThis, const TiXmlNode& addThis )
-{	
-	if ( !beforeThis || beforeThis->parent != this ) {
-		return 0;
-	}
-	if ( addThis.Type() == TiXmlNode::TINYXML_DOCUMENT )
-	{
-		if ( GetDocument() ) 
-			GetDocument()->SetError( TIXML_ERROR_DOCUMENT_TOP_ONLY, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return 0;
-	}
-
-	TiXmlNode* node = addThis.Clone();
-	if ( !node )
-		return 0;
-	node->parent = this;
-
-	node->next = beforeThis;
-	node->prev = beforeThis->prev;
-	if ( beforeThis->prev )
-	{
-		beforeThis->prev->next = node;
-	}
-	else
-	{
-		assert( firstChild == beforeThis );
-		firstChild = node;
-	}
-	beforeThis->prev = node;
-	return node;
-}
-
-
-TiXmlNode* TiXmlNode::InsertAfterChild( TiXmlNode* afterThis, const TiXmlNode& addThis )
-{
-	if ( !afterThis || afterThis->parent != this ) {
-		return 0;
-	}
-	if ( addThis.Type() == TiXmlNode::TINYXML_DOCUMENT )
-	{
-		if ( GetDocument() ) 
-			GetDocument()->SetError( TIXML_ERROR_DOCUMENT_TOP_ONLY, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return 0;
-	}
-
-	TiXmlNode* node = addThis.Clone();
-	if ( !node )
-		return 0;
-	node->parent = this;
-
-	node->prev = afterThis;
-	node->next = afterThis->next;
-	if ( afterThis->next )
-	{
-		afterThis->next->prev = node;
-	}
-	else
-	{
-		assert( lastChild == afterThis );
-		lastChild = node;
-	}
-	afterThis->next = node;
-	return node;
-}
-
-
-TiXmlNode* TiXmlNode::ReplaceChild( TiXmlNode* replaceThis, const TiXmlNode& withThis )
-{
-	if ( !replaceThis )
-		return 0;
-
-	if ( replaceThis->parent != this )
-		return 0;
-
-	if ( withThis.ToDocument() ) {
-		// A document can never be a child.	Thanks to Noam.
-		TiXmlDocument* document = GetDocument();
-		if ( document ) 
-			document->SetError( TIXML_ERROR_DOCUMENT_TOP_ONLY, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return 0;
-	}
-
-	TiXmlNode* node = withThis.Clone();
-	if ( !node )
-		return 0;
-
-	node->next = replaceThis->next;
-	node->prev = replaceThis->prev;
-
-	if ( replaceThis->next )
-		replaceThis->next->prev = node;
-	else
-		lastChild = node;
-
-	if ( replaceThis->prev )
-		replaceThis->prev->next = node;
-	else
-		firstChild = node;
-
-	delete replaceThis;
-	node->parent = this;
-	return node;
-}
-
-
-bool TiXmlNode::RemoveChild( TiXmlNode* removeThis )
-{
-	if ( !removeThis ) {
-		return false;
-	}
-
-	if ( removeThis->parent != this )
-	{	
-		assert( 0 );
-		return false;
-	}
-
-	if ( removeThis->next )
-		removeThis->next->prev = removeThis->prev;
-	else
-		lastChild = removeThis->prev;
-
-	if ( removeThis->prev )
-		removeThis->prev->next = removeThis->next;
-	else
-		firstChild = removeThis->next;
-
-	delete removeThis;
-	return true;
-}
-
-const TiXmlNode* TiXmlNode::FirstChild( const char * _value ) const
-{
-	const TiXmlNode* node;
-	for ( node = firstChild; node; node = node->next )
-	{
-		if ( strcmp( node->Value(), _value ) == 0 )
-			return node;
-	}
-	return 0;
-}
-
-
-const TiXmlNode* TiXmlNode::LastChild( const char * _value ) const
-{
-	const TiXmlNode* node;
-	for ( node = lastChild; node; node = node->prev )
-	{
-		if ( strcmp( node->Value(), _value ) == 0 )
-			return node;
-	}
-	return 0;
-}
-
-
-const TiXmlNode* TiXmlNode::IterateChildren( const TiXmlNode* previous ) const
-{
-	if ( !previous )
-	{
-		return FirstChild();
-	}
-	else
-	{
-		assert( previous->parent == this );
-		return previous->NextSibling();
-	}
-}
-
-
-const TiXmlNode* TiXmlNode::IterateChildren( const char * val, const TiXmlNode* previous ) const
-{
-	if ( !previous )
-	{
-		return FirstChild( val );
-	}
-	else
-	{
-		assert( previous->parent == this );
-		return previous->NextSibling( val );
-	}
-}
-
-
-const TiXmlNode* TiXmlNode::NextSibling( const char * _value ) const 
-{
-	const TiXmlNode* node;
-	for ( node = next; node; node = node->next )
-	{
-		if ( strcmp( node->Value(), _value ) == 0 )
-			return node;
-	}
-	return 0;
-}
-
-
-const TiXmlNode* TiXmlNode::PreviousSibling( const char * _value ) const
-{
-	const TiXmlNode* node;
-	for ( node = prev; node; node = node->prev )
-	{
-		if ( strcmp( node->Value(), _value ) == 0 )
-			return node;
-	}
-	return 0;
-}
-
-
-void TiXmlElement::RemoveAttribute( const char * name )
-{
- #ifdef TIXML_USE_STL
-	TIXML_STRING str( name );
-	TiXmlAttribute* node = attributeSet.Find( str );
-	#else
-	TiXmlAttribute* node = attributeSet.Find( name );
-	#endif
-	if ( node )
-	{
-		attributeSet.Remove( node );
-		delete node;
-	}
-}
-
-const TiXmlElement* TiXmlNode::FirstChildElement() const
-{
-	const TiXmlNode* node;
-
-	for (	node = FirstChild();
-			node;
-			node = node->NextSibling() )
-	{
-		if ( node->ToElement() )
-			return node->ToElement();
-	}
-	return 0;
-}
-
-
-const TiXmlElement* TiXmlNode::FirstChildElement( const char * _value ) const
-{
-	const TiXmlNode* node;
-
-	for (	node = FirstChild( _value );
-			node;
-			node = node->NextSibling( _value ) )
-	{
-		if ( node->ToElement() )
-			return node->ToElement();
-	}
-	return 0;
-}
-
-
-const TiXmlElement* TiXmlNode::NextSiblingElement() const
-{
-	const TiXmlNode* node;
-
-	for (	node = NextSibling();
-			node;
-			node = node->NextSibling() )
-	{
-		if ( node->ToElement() )
-			return node->ToElement();
-	}
-	return 0;
-}
-
-
-const TiXmlElement* TiXmlNode::NextSiblingElement( const char * _value ) const
-{
-	const TiXmlNode* node;
-
-	for (	node = NextSibling( _value );
-			node;
-			node = node->NextSibling( _value ) )
-	{
-		if ( node->ToElement() )
-			return node->ToElement();
-	}
-	return 0;
-}
-
-
-const TiXmlDocument* TiXmlNode::GetDocument() const
-{
-	const TiXmlNode* node;
-
-	for( node = this; node; node = node->parent )
-	{
-		if ( node->ToDocument() )
-			return node->ToDocument();
-	}
-	return 0;
-}
-
-
-TiXmlElement::TiXmlElement (const char * _value)
-	: TiXmlNode( TiXmlNode::TINYXML_ELEMENT )
-{
-	firstChild = lastChild = 0;
-	value = _value;
-}
-
-
-#ifdef TIXML_USE_STL
-TiXmlElement::TiXmlElement( const std::string& _value ) 
-	: TiXmlNode( TiXmlNode::TINYXML_ELEMENT )
-{
-	firstChild = lastChild = 0;
-	value = _value;
-}
-#endif
-
-
-TiXmlElement::TiXmlElement( const TiXmlElement& copy)
-	: TiXmlNode( TiXmlNode::TINYXML_ELEMENT )
-{
-	firstChild = lastChild = 0;
-	copy.CopyTo( this );	
-}
-
-
-TiXmlElement& TiXmlElement::operator=( const TiXmlElement& base )
-{
-	ClearThis();
-	base.CopyTo( this );
-	return *this;
-}
-
-
-TiXmlElement::~TiXmlElement()
-{
-	ClearThis();
-}
-
-
-void TiXmlElement::ClearThis()
-{
-	Clear();
-	while( attributeSet.First() )
-	{
-		TiXmlAttribute* node = attributeSet.First();
-		attributeSet.Remove( node );
-		delete node;
-	}
-}
-
-
-const char* TiXmlElement::Attribute( const char* name ) const
-{
-	const TiXmlAttribute* node = attributeSet.Find( name );
-	if ( node )
-		return node->Value();
-	return 0;
-}
-
-
-#ifdef TIXML_USE_STL
-const std::string* TiXmlElement::Attribute( const std::string& name ) const
-{
-	const TiXmlAttribute* attrib = attributeSet.Find( name );
-	if ( attrib )
-		return &attrib->ValueStr();
-	return 0;
-}
-#endif
-
-
-const char* TiXmlElement::Attribute( const char* name, int* i ) const
-{
-	const TiXmlAttribute* attrib = attributeSet.Find( name );
-	const char* result = 0;
-
-	if ( attrib ) {
-		result = attrib->Value();
-		if ( i ) {
-			attrib->QueryIntValue( i );
-		}
-	}
-	return result;
-}
-
-
-#ifdef TIXML_USE_STL
-const std::string* TiXmlElement::Attribute( const std::string& name, int* i ) const
-{
-	const TiXmlAttribute* attrib = attributeSet.Find( name );
-	const std::string* result = 0;
-
-	if ( attrib ) {
-		result = &attrib->ValueStr();
-		if ( i ) {
-			attrib->QueryIntValue( i );
-		}
-	}
-	return result;
-}
-#endif
-
-
-const char* TiXmlElement::Attribute( const char* name, double* d ) const
-{
-	const TiXmlAttribute* attrib = attributeSet.Find( name );
-	const char* result = 0;
-
-	if ( attrib ) {
-		result = attrib->Value();
-		if ( d ) {
-			attrib->QueryDoubleValue( d );
-		}
-	}
-	return result;
-}
-
-
-#ifdef TIXML_USE_STL
-const std::string* TiXmlElement::Attribute( const std::string& name, double* d ) const
-{
-	const TiXmlAttribute* attrib = attributeSet.Find( name );
-	const std::string* result = 0;
-
-	if ( attrib ) {
-		result = &attrib->ValueStr();
-		if ( d ) {
-			attrib->QueryDoubleValue( d );
-		}
-	}
-	return result;
-}
-#endif
-
-
-int TiXmlElement::QueryIntAttribute( const char* name, int* ival ) const
-{
-	const TiXmlAttribute* attrib = attributeSet.Find( name );
-	if ( !attrib )
-		return TIXML_NO_ATTRIBUTE;
-	return attrib->QueryIntValue( ival );
-}
-
-
-int TiXmlElement::QueryUnsignedAttribute( const char* name, unsigned* value ) const
-{
-	const TiXmlAttribute* node = attributeSet.Find( name );
-	if ( !node )
-		return TIXML_NO_ATTRIBUTE;
-
-	int ival = 0;
-	int result = node->QueryIntValue( &ival );
-	*value = (unsigned)ival;
-	return result;
-}
-
-
-int TiXmlElement::QueryBoolAttribute( const char* name, bool* bval ) const
-{
-	const TiXmlAttribute* node = attributeSet.Find( name );
-	if ( !node )
-		return TIXML_NO_ATTRIBUTE;
-	
-	int result = TIXML_WRONG_TYPE;
-	if ( StringEqual( node->Value(), "true", true, TIXML_ENCODING_UNKNOWN ) 
-		 || StringEqual( node->Value(), "yes", true, TIXML_ENCODING_UNKNOWN ) 
-		 || StringEqual( node->Value(), "1", true, TIXML_ENCODING_UNKNOWN ) ) 
-	{
-		*bval = true;
-		result = TIXML_SUCCESS;
-	}
-	else if ( StringEqual( node->Value(), "false", true, TIXML_ENCODING_UNKNOWN ) 
-			 || StringEqual( node->Value(), "no", true, TIXML_ENCODING_UNKNOWN ) 
-			 || StringEqual( node->Value(), "0", true, TIXML_ENCODING_UNKNOWN ) ) 
-	{
-		*bval = false;
-		result = TIXML_SUCCESS;
-	}
-	return result;
-}
-
-
-
-#ifdef TIXML_USE_STL
-int TiXmlElement::QueryIntAttribute( const std::string& name, int* ival ) const
-{
-	const TiXmlAttribute* attrib = attributeSet.Find( name );
-	if ( !attrib )
-		return TIXML_NO_ATTRIBUTE;
-	return attrib->QueryIntValue( ival );
-}
-#endif
-
-
-int TiXmlElement::QueryDoubleAttribute( const char* name, double* dval ) const
-{
-	const TiXmlAttribute* attrib = attributeSet.Find( name );
-	if ( !attrib )
-		return TIXML_NO_ATTRIBUTE;
-	return attrib->QueryDoubleValue( dval );
-}
-
-
-#ifdef TIXML_USE_STL
-int TiXmlElement::QueryDoubleAttribute( const std::string& name, double* dval ) const
-{
-	const TiXmlAttribute* attrib = attributeSet.Find( name );
-	if ( !attrib )
-		return TIXML_NO_ATTRIBUTE;
-	return attrib->QueryDoubleValue( dval );
-}
-#endif
-
-
-void TiXmlElement::SetAttribute( const char * name, int val )
-{	
-	TiXmlAttribute* attrib = attributeSet.FindOrCreate( name );
-	if ( attrib ) {
-		attrib->SetIntValue( val );
-	}
-}
-
-
-#ifdef TIXML_USE_STL
-void TiXmlElement::SetAttribute( const std::string& name, int val )
-{	
-	TiXmlAttribute* attrib = attributeSet.FindOrCreate( name );
-	if ( attrib ) {
-		attrib->SetIntValue( val );
-	}
-}
-#endif
-
-
-void TiXmlElement::SetDoubleAttribute( const char * name, double val )
-{	
-	TiXmlAttribute* attrib = attributeSet.FindOrCreate( name );
-	if ( attrib ) {
-		attrib->SetDoubleValue( val );
-	}
-}
-
-
-#ifdef TIXML_USE_STL
-void TiXmlElement::SetDoubleAttribute( const std::string& name, double val )
-{	
-	TiXmlAttribute* attrib = attributeSet.FindOrCreate( name );
-	if ( attrib ) {
-		attrib->SetDoubleValue( val );
-	}
-}
-#endif 
-
-
-void TiXmlElement::SetAttribute( const char * cname, const char * cvalue )
-{
-	TiXmlAttribute* attrib = attributeSet.FindOrCreate( cname );
-	if ( attrib ) {
-		attrib->SetValue( cvalue );
-	}
-}
-
-
-#ifdef TIXML_USE_STL
-void TiXmlElement::SetAttribute( const std::string& _name, const std::string& _value )
-{
-	TiXmlAttribute* attrib = attributeSet.FindOrCreate( _name );
-	if ( attrib ) {
-		attrib->SetValue( _value );
-	}
-}
-#endif
-
-
-void TiXmlElement::Print( FILE* cfile, int depth ) const
-{
-	int i;
-	assert( cfile );
-	for ( i=0; i<depth; i++ ) {
-		fprintf( cfile, " " );
-	}
-
-	fprintf( cfile, "<%s", value.c_str() );
-
-	const TiXmlAttribute* attrib;
-	for ( attrib = attributeSet.First(); attrib; attrib = attrib->Next() )
-	{
-		fprintf( cfile, " " );
-		attrib->Print( cfile, depth );
-	}
-
-	// There are 3 different formatting approaches:
-	// 1) An element without children is printed as a <foo /> node
-	// 2) An element with only a text child is printed as <foo> text </foo>
-	// 3) An element with children is printed on multiple lines.
-	TiXmlNode* node;
-	if ( !firstChild )
-	{
-		fprintf( cfile, " />" );
-	}
-	else if ( firstChild == lastChild && firstChild->ToText() )
-	{
-		fprintf( cfile, ">" );
-		firstChild->Print( cfile, depth + 1 );
-		fprintf( cfile, "</%s>", value.c_str() );
-	}
-	else
-	{
-		fprintf( cfile, ">" );
-
-		for ( node = firstChild; node; node=node->NextSibling() )
-		{
-			if ( !node->ToText() )
-			{
-				fprintf( cfile, "\n" );
-			}
-			node->Print( cfile, depth+1 );
-		}
-		fprintf( cfile, "\n" );
-		for( i=0; i<depth; ++i ) {
-			fprintf( cfile, " " );
-		}
-		fprintf( cfile, "</%s>", value.c_str() );
-	}
-}
-
-
-void TiXmlElement::CopyTo( TiXmlElement* target ) const
-{
-	// superclass:
-	TiXmlNode::CopyTo( target );
-
-	// Element class: 
-	// Clone the attributes, then clone the children.
-	const TiXmlAttribute* attribute = 0;
-	for(	attribute = attributeSet.First();
-	attribute;
-	attribute = attribute->Next() )
-	{
-		target->SetAttribute( attribute->Name(), attribute->Value() );
-	}
-
-	TiXmlNode* node = 0;
-	for ( node = firstChild; node; node = node->NextSibling() )
-	{
-		target->LinkEndChild( node->Clone() );
-	}
-}
-
-bool TiXmlElement::Accept( TiXmlVisitor* visitor ) const
-{
-	if ( visitor->VisitEnter( *this, attributeSet.First() ) ) 
-	{
-		for ( const TiXmlNode* node=FirstChild(); node; node=node->NextSibling() )
-		{
-			if ( !node->Accept( visitor ) )
-				break;
-		}
-	}
-	return visitor->VisitExit( *this );
-}
-
-
-TiXmlNode* TiXmlElement::Clone() const
-{
-	TiXmlElement* clone = new TiXmlElement( Value() );
-	if ( !clone )
-		return 0;
-
-	CopyTo( clone );
-	return clone;
-}
-
-
-const char* TiXmlElement::GetText() const
-{
-	const TiXmlNode* child = this->FirstChild();
-	if ( child ) {
-		const TiXmlText* childText = child->ToText();
-		if ( childText ) {
-			return childText->Value();
-		}
-	}
-	return 0;
-}
-
-
-TiXmlDocument::TiXmlDocument() : TiXmlNode( TiXmlNode::TINYXML_DOCUMENT )
-{
-	tabsize = 4;
-	useMicrosoftBOM = false;
-	ClearError();
-}
-
-TiXmlDocument::TiXmlDocument( const char * documentName ) : TiXmlNode( TiXmlNode::TINYXML_DOCUMENT )
-{
-	tabsize = 4;
-	useMicrosoftBOM = false;
-	value = documentName;
-	ClearError();
-}
-
-
-#ifdef TIXML_USE_STL
-TiXmlDocument::TiXmlDocument( const std::string& documentName ) : TiXmlNode( TiXmlNode::TINYXML_DOCUMENT )
-{
-	tabsize = 4;
-	useMicrosoftBOM = false;
- value = documentName;
-	ClearError();
-}
-#endif
-
-
-TiXmlDocument::TiXmlDocument( const TiXmlDocument& copy ) : TiXmlNode( TiXmlNode::TINYXML_DOCUMENT )
-{
-	copy.CopyTo( this );
-}
-
-
-TiXmlDocument& TiXmlDocument::operator=( const TiXmlDocument& copy )
-{
-	Clear();
-	copy.CopyTo( this );
-	return *this;
-}
-
-
-bool TiXmlDocument::LoadFile( TiXmlEncoding encoding )
-{
-	return LoadFile( Value(), encoding );
-}
-
-
-bool TiXmlDocument::SaveFile() const
-{
-	return SaveFile( Value() );
-}
-
-bool TiXmlDocument::LoadFile( const char* _filename, TiXmlEncoding encoding )
-{
-	TIXML_STRING filename( _filename );
-	value = filename;
-
-	// reading in binary mode so that tinyxml can normalize the EOL
-	FILE* file = TiXmlFOpen( value.c_str (), "rb" );	
-
-	if ( file )
-	{
-		bool result = LoadFile( file, encoding );
-		fclose( file );
-		return result;
-	}
-	else
-	{
-		SetError( TIXML_ERROR_OPENING_FILE, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return false;
-	}
-}
-
-bool TiXmlDocument::LoadFile( FILE* file, TiXmlEncoding encoding )
-{
-	if ( !file ) 
-	{
-		SetError( TIXML_ERROR_OPENING_FILE, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return false;
-	}
-
-	// Delete the existing data:
-	Clear();
-	location.Clear();
-
-	// Get the file size, so we can pre-allocate the string. HUGE speed impact.
-	long length = 0;
-	fseek( file, 0, SEEK_END );
-	length = ftell( file );
-	fseek( file, 0, SEEK_SET );
-
-	// Strange case, but good to handle up front.
-	if ( length <= 0 )
-	{
-		SetError( TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return false;
-	}
-
-	// Subtle bug here. TinyXml did use fgets. But from the XML spec:
-	// 2.11 End-of-Line Handling
-	// <snip>
-	// <quote>
-	// ...the XML processor MUST behave as if it normalized all line breaks in external 
-	// parsed entities (including the document entity) on input, before parsing, by translating 
-	// both the two-character sequence #xD #xA and any #xD that is not followed by #xA to 
-	// a single #xA character.
-	// </quote>
-	//
-	// It is not clear fgets does that, and certainly isn't clear it works cross platform. 
-	// Generally, you expect fgets to translate from the convention of the OS to the c/unix
-	// convention, and not work generally.
-
-	/*
-	while( fgets( buf, sizeof(buf), file ) )
-	{
-		data += buf;
-	}
-	*/
-
-	char* buf = new char length+1 ;
-	buf0 = 0;
-
-	if ( fread( buf, length, 1, file ) != 1 ) {
-		delete buf;
-		SetError( TIXML_ERROR_OPENING_FILE, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return false;
-	}
-
-	// Process the buffer in place to normalize new lines. (See comment above.)
-	// Copies from the 'p' to 'q' pointer, where p can advance faster if
-	// a newline-carriage return is hit.
-	//
-	// Wikipedia:
-	// Systems based on ASCII or a compatible character set use either LF (Line feed, '\n', 0x0A, 10 in decimal) or 
-	// CR (Carriage return, '\r', 0x0D, 13 in decimal) individually, or CR followed by LF (CR+LF, 0x0D 0x0A)...
-	//		* LF: Multics, Unix and Unix-like systems (GNU/Linux, AIX, Xenix, Mac OS X, FreeBSD, etc.), BeOS, Amiga, RISC OS, and others
- //		* CR+LF: DEC RT-11 and most other early non-Unix, non-IBM OSes, CP/M, MP/M, DOS, OS/2, Microsoft Windows, Symbian OS
- //		* CR: Commodore 8-bit machines, Apple II family, Mac OS up to version 9 and OS-9
-
-	const char* p = buf;	// the read head
-	char* q = buf;			// the write head
-	const char CR = 0x0d;
-	const char LF = 0x0a;
-
-	buflength = 0;
-	while( *p ) {
-		assert( p < (buf+length) );
-		assert( q <= (buf+length) );
-		assert( q <= p );
-
-		if ( *p == CR ) {
-			*q++ = LF;
-			p++;
-			if ( *p == LF ) {		// check for CR+LF (and skip LF)
-				p++;
-			}
-		}
-		else {
-			*q++ = *p++;
-		}
-	}
-	assert( q <= (buf+length) );
-	*q = 0;
-
-	Parse( buf, 0, encoding );
-
-	delete buf;
-	return !Error();
-}
-
-
-bool TiXmlDocument::SaveFile( const char * filename ) const
-{
-	// The old c stuff lives on...
-	FILE* fp = TiXmlFOpen( filename, "w" );
-	if ( fp )
-	{
-		bool result = SaveFile( fp );
-		fclose( fp );
-		return result;
-	}
-	return false;
-}
-
-
-bool TiXmlDocument::SaveFile( FILE* fp ) const
-{
-	if ( useMicrosoftBOM ) 
-	{
-		const unsigned char TIXML_UTF_LEAD_0 = 0xefU;
-		const unsigned char TIXML_UTF_LEAD_1 = 0xbbU;
-		const unsigned char TIXML_UTF_LEAD_2 = 0xbfU;
-
-		fputc( TIXML_UTF_LEAD_0, fp );
-		fputc( TIXML_UTF_LEAD_1, fp );
-		fputc( TIXML_UTF_LEAD_2, fp );
-	}
-	Print( fp, 0 );
-	return (ferror(fp) == 0);
-}
-
-
-void TiXmlDocument::CopyTo( TiXmlDocument* target ) const
-{
-	TiXmlNode::CopyTo( target );
-
-	target->error = error;
-	target->errorId = errorId;
-	target->errorDesc = errorDesc;
-	target->tabsize = tabsize;
-	target->errorLocation = errorLocation;
-	target->useMicrosoftBOM = useMicrosoftBOM;
-
-	TiXmlNode* node = 0;
-	for ( node = firstChild; node; node = node->NextSibling() )
-	{
-		target->LinkEndChild( node->Clone() );
-	}	
-}
-
-
-TiXmlNode* TiXmlDocument::Clone() const
-{
-	TiXmlDocument* clone = new TiXmlDocument();
-	if ( !clone )
-		return 0;
-
-	CopyTo( clone );
-	return clone;
-}
-
-
-void TiXmlDocument::Print( FILE* cfile, int depth ) const
-{
-	assert( cfile );
-	for ( const TiXmlNode* node=FirstChild(); node; node=node->NextSibling() )
-	{
-		node->Print( cfile, depth );
-		fprintf( cfile, "\n" );
-	}
-}
-
-
-bool TiXmlDocument::Accept( TiXmlVisitor* visitor ) const
-{
-	if ( visitor->VisitEnter( *this ) )
-	{
-		for ( const TiXmlNode* node=FirstChild(); node; node=node->NextSibling() )
-		{
-			if ( !node->Accept( visitor ) )
-				break;
-		}
-	}
-	return visitor->VisitExit( *this );
-}
-
-
-const TiXmlAttribute* TiXmlAttribute::Next() const
-{
-	// We are using knowledge of the sentinel. The sentinel
-	// have a value or name.
-	if ( next->value.empty() && next->name.empty() )
-		return 0;
-	return next;
-}
-
-/*
-TiXmlAttribute* TiXmlAttribute::Next()
-{
-	// We are using knowledge of the sentinel. The sentinel
-	// have a value or name.
-	if ( next->value.empty() && next->name.empty() )
-		return 0;
-	return next;
-}
-*/
-
-const TiXmlAttribute* TiXmlAttribute::Previous() const
-{
-	// We are using knowledge of the sentinel. The sentinel
-	// have a value or name.
-	if ( prev->value.empty() && prev->name.empty() )
-		return 0;
-	return prev;
-}
-
-/*
-TiXmlAttribute* TiXmlAttribute::Previous()
-{
-	// We are using knowledge of the sentinel. The sentinel
-	// have a value or name.
-	if ( prev->value.empty() && prev->name.empty() )
-		return 0;
-	return prev;
-}
-*/
-
-void TiXmlAttribute::Print( FILE* cfile, int /*depth*/, TIXML_STRING* str ) const
-{
-	TIXML_STRING n, v;
-
-	EncodeString( name, &n );
-	EncodeString( value, &v );
-
-	if (value.find ('\"') == TIXML_STRING::npos) {
-		if ( cfile ) {
-			fprintf (cfile, "%s=\"%s\"", n.c_str(), v.c_str() );
-		}
-		if ( str ) {
-			(*str) += n; (*str) += "=\""; (*str) += v; (*str) += "\"";
-		}
-	}
-	else {
-		if ( cfile ) {
-			fprintf (cfile, "%s='%s'", n.c_str(), v.c_str() );
-		}
-		if ( str ) {
-			(*str) += n; (*str) += "='"; (*str) += v; (*str) += "'";
-		}
-	}
-}
-
-
-int TiXmlAttribute::QueryIntValue( int* ival ) const
-{
-	if ( TIXML_SSCANF( value.c_str(), "%d", ival ) == 1 )
-		return TIXML_SUCCESS;
-	return TIXML_WRONG_TYPE;
-}
-
-int TiXmlAttribute::QueryDoubleValue( double* dval ) const
-{
-	if ( TIXML_SSCANF( value.c_str(), "%lf", dval ) == 1 )
-		return TIXML_SUCCESS;
-	return TIXML_WRONG_TYPE;
-}
-
-void TiXmlAttribute::SetIntValue( int _value )
-{
-	char buf 64;
-	#if defined(TIXML_SNPRINTF)		
-		TIXML_SNPRINTF(buf, sizeof(buf), "%d", _value);
-	#else
-		sprintf (buf, "%d", _value);
-	#endif
-	SetValue (buf);
-}
-
-void TiXmlAttribute::SetDoubleValue( double _value )
-{
-	char buf 256;
-	#if defined(TIXML_SNPRINTF)		
-		TIXML_SNPRINTF( buf, sizeof(buf), "%g", _value);
-	#else
-		sprintf (buf, "%g", _value);
-	#endif
-	SetValue (buf);
-}
-
-int TiXmlAttribute::IntValue() const
-{
-	return atoi (value.c_str ());
-}
-
-double TiXmlAttribute::DoubleValue() const
-{
-	return atof (value.c_str ());
-}
-
-
-TiXmlComment::TiXmlComment( const TiXmlComment& copy ) : TiXmlNode( TiXmlNode::TINYXML_COMMENT )
-{
-	copy.CopyTo( this );
-}
-
-
-TiXmlComment& TiXmlComment::operator=( const TiXmlComment& base )
-{
-	Clear();
-	base.CopyTo( this );
-	return *this;
-}
-
-
-void TiXmlComment::Print( FILE* cfile, int depth ) const
-{
-	assert( cfile );
-	for ( int i=0; i<depth; i++ )
-	{
-		fprintf( cfile, " " );
-	}
-	fprintf( cfile, "", value.c_str() );
-}
-
-
-void TiXmlComment::CopyTo( TiXmlComment* target ) const
-{
-	TiXmlNode::CopyTo( target );
-}
-
-
-bool TiXmlComment::Accept( TiXmlVisitor* visitor ) const
-{
-	return visitor->Visit( *this );
-}
-
-
-TiXmlNode* TiXmlComment::Clone() const
-{
-	TiXmlComment* clone = new TiXmlComment();
-
-	if ( !clone )
-		return 0;
-
-	CopyTo( clone );
-	return clone;
-}
-
-
-void TiXmlText::Print( FILE* cfile, int depth ) const
-{
-	assert( cfile );
-	if ( cdata )
-	{
-		int i;
-		fprintf( cfile, "\n" );
-		for ( i=0; i<depth; i++ ) {
-			fprintf( cfile, " " );
-		}
-		fprintf( cfile, "<!CDATA%s>\n", value.c_str() );	// unformatted output
-	}
-	else
-	{
-		TIXML_STRING buffer;
-		EncodeString( value, &buffer );
-		fprintf( cfile, "%s", buffer.c_str() );
-	}
-}
-
-
-void TiXmlText::CopyTo( TiXmlText* target ) const
-{
-	TiXmlNode::CopyTo( target );
-	target->cdata = cdata;
-}
-
-
-bool TiXmlText::Accept( TiXmlVisitor* visitor ) const
-{
-	return visitor->Visit( *this );
-}
-
-
-TiXmlNode* TiXmlText::Clone() const
-{	
-	TiXmlText* clone = 0;
-	clone = new TiXmlText( "" );
-
-	if ( !clone )
-		return 0;
-
-	CopyTo( clone );
-	return clone;
-}
-
-
-TiXmlDeclaration::TiXmlDeclaration( const char * _version,
-									const char * _encoding,
-									const char * _standalone )
-	: TiXmlNode( TiXmlNode::TINYXML_DECLARATION )
-{
-	version = _version;
-	encoding = _encoding;
-	standalone = _standalone;
-}
-
-
-#ifdef TIXML_USE_STL
-TiXmlDeclaration::TiXmlDeclaration(	const std::string& _version,
-									const std::string& _encoding,
-									const std::string& _standalone )
-	: TiXmlNode( TiXmlNode::TINYXML_DECLARATION )
-{
-	version = _version;
-	encoding = _encoding;
-	standalone = _standalone;
-}
-#endif
-
-
-TiXmlDeclaration::TiXmlDeclaration( const TiXmlDeclaration& copy )
-	: TiXmlNode( TiXmlNode::TINYXML_DECLARATION )
-{
-	copy.CopyTo( this );	
-}
-
-
-TiXmlDeclaration& TiXmlDeclaration::operator=( const TiXmlDeclaration& copy )
-{
-	Clear();
-	copy.CopyTo( this );
-	return *this;
-}
-
-
-void TiXmlDeclaration::Print( FILE* cfile, int /*depth*/, TIXML_STRING* str ) const
-{
-	if ( cfile ) fprintf( cfile, "<?xml " );
-	if ( str )	 (*str) += "<?xml ";
-
-	if ( !version.empty() ) {
-		if ( cfile ) fprintf (cfile, "version=\"%s\" ", version.c_str ());
-		if ( str ) { (*str) += "version=\""; (*str) += version; (*str) += "\" "; }
-	}
-	if ( !encoding.empty() ) {
-		if ( cfile ) fprintf (cfile, "encoding=\"%s\" ", encoding.c_str ());
-		if ( str ) { (*str) += "encoding=\""; (*str) += encoding; (*str) += "\" "; }
-	}
-	if ( !standalone.empty() ) {
-		if ( cfile ) fprintf (cfile, "standalone=\"%s\" ", standalone.c_str ());
-		if ( str ) { (*str) += "standalone=\""; (*str) += standalone; (*str) += "\" "; }
-	}
-	if ( cfile ) fprintf( cfile, "?>" );
-	if ( str )	 (*str) += "?>";
-}
-
-
-void TiXmlDeclaration::CopyTo( TiXmlDeclaration* target ) const
-{
-	TiXmlNode::CopyTo( target );
-
-	target->version = version;
-	target->encoding = encoding;
-	target->standalone = standalone;
-}
-
-
-bool TiXmlDeclaration::Accept( TiXmlVisitor* visitor ) const
-{
-	return visitor->Visit( *this );
-}
-
-
-TiXmlNode* TiXmlDeclaration::Clone() const
-{	
-	TiXmlDeclaration* clone = new TiXmlDeclaration();
-
-	if ( !clone )
-		return 0;
-
-	CopyTo( clone );
-	return clone;
-}
-
-
-void TiXmlUnknown::Print( FILE* cfile, int depth ) const
-{
-	for ( int i=0; i<depth; i++ )
-		fprintf( cfile, " " );
-	fprintf( cfile, "<%s>", value.c_str() );
-}
-
-
-void TiXmlUnknown::CopyTo( TiXmlUnknown* target ) const
-{
-	TiXmlNode::CopyTo( target );
-}
-
-
-bool TiXmlUnknown::Accept( TiXmlVisitor* visitor ) const
-{
-	return visitor->Visit( *this );
-}
-
-
-TiXmlNode* TiXmlUnknown::Clone() const
-{
-	TiXmlUnknown* clone = new TiXmlUnknown();
-
-	if ( !clone )
-		return 0;
-
-	CopyTo( clone );
-	return clone;
-}
-
-
-TiXmlAttributeSet::TiXmlAttributeSet()
-{
-	sentinel.next = &sentinel;
-	sentinel.prev = &sentinel;
-}
-
-
-TiXmlAttributeSet::~TiXmlAttributeSet()
-{
-	assert( sentinel.next == &sentinel );
-	assert( sentinel.prev == &sentinel );
-}
-
-
-void TiXmlAttributeSet::Add( TiXmlAttribute* addMe )
-{
- #ifdef TIXML_USE_STL
-	assert( !Find( TIXML_STRING( addMe->Name() ) ) );	// Shouldn't be multiply adding to the set.
-	#else
-	assert( !Find( addMe->Name() ) );	// Shouldn't be multiply adding to the set.
-	#endif
-
-	addMe->next = &sentinel;
-	addMe->prev = sentinel.prev;
-
-	sentinel.prev->next = addMe;
-	sentinel.prev = addMe;
-}
-
-void TiXmlAttributeSet::Remove( TiXmlAttribute* removeMe )
-{
-	TiXmlAttribute* node;
-
-	for( node = sentinel.next; node != &sentinel; node = node->next )
-	{
-		if ( node == removeMe )
-		{
-			node->prev->next = node->next;
-			node->next->prev = node->prev;
-			node->next = 0;
-			node->prev = 0;
-			return;
-		}
-	}
-	assert( 0 );		// we tried to remove a non-linked attribute.
-}
-
-
-#ifdef TIXML_USE_STL
-TiXmlAttribute* TiXmlAttributeSet::Find( const std::string& name ) const
-{
-	for( TiXmlAttribute* node = sentinel.next; node != &sentinel; node = node->next )
-	{
-		if ( node->name == name )
-			return node;
-	}
-	return 0;
-}
-
-TiXmlAttribute* TiXmlAttributeSet::FindOrCreate( const std::string& _name )
-{
-	TiXmlAttribute* attrib = Find( _name );
-	if ( !attrib ) {
-		attrib = new TiXmlAttribute();
-		Add( attrib );
-		attrib->SetName( _name );
-	}
-	return attrib;
-}
-#endif
-
-
-TiXmlAttribute* TiXmlAttributeSet::Find( const char* name ) const
-{
-	for( TiXmlAttribute* node = sentinel.next; node != &sentinel; node = node->next )
-	{
-		if ( strcmp( node->name.c_str(), name ) == 0 )
-			return node;
-	}
-	return 0;
-}
-
-
-TiXmlAttribute* TiXmlAttributeSet::FindOrCreate( const char* _name )
-{
-	TiXmlAttribute* attrib = Find( _name );
-	if ( !attrib ) {
-		attrib = new TiXmlAttribute();
-		Add( attrib );
-		attrib->SetName( _name );
-	}
-	return attrib;
-}
-
-
-#ifdef TIXML_USE_STL	
-std::istream& operator>> (std::istream & in, TiXmlNode & base)
-{
-	TIXML_STRING tag;
-	tag.reserve( 8 * 1000 );
-	base.StreamIn( &in, &tag );
-
-	base.Parse( tag.c_str(), 0, TIXML_DEFAULT_ENCODING );
-	return in;
-}
-#endif
-
-
-#ifdef TIXML_USE_STL	
-std::ostream& operator<< (std::ostream & out, const TiXmlNode & base)
-{
-	TiXmlPrinter printer;
-	printer.SetStreamPrinting();
-	base.Accept( &printer );
-	out << printer.Str();
-
-	return out;
-}
-
-
-std::string& operator<< (std::string& out, const TiXmlNode& base )
-{
-	TiXmlPrinter printer;
-	printer.SetStreamPrinting();
-	base.Accept( &printer );
-	out.append( printer.Str() );
-
-	return out;
-}
-#endif
-
-
-TiXmlHandle TiXmlHandle::FirstChild() const
-{
-	if ( node )
-	{
-		TiXmlNode* child = node->FirstChild();
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
-}
-
-
-TiXmlHandle TiXmlHandle::FirstChild( const char * value ) const
-{
-	if ( node )
-	{
-		TiXmlNode* child = node->FirstChild( value );
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
-}
-
-
-TiXmlHandle TiXmlHandle::FirstChildElement() const
-{
-	if ( node )
-	{
-		TiXmlElement* child = node->FirstChildElement();
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
-}
-
-
-TiXmlHandle TiXmlHandle::FirstChildElement( const char * value ) const
-{
-	if ( node )
-	{
-		TiXmlElement* child = node->FirstChildElement( value );
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
-}
-
-
-TiXmlHandle TiXmlHandle::Child( int count ) const
-{
-	if ( node )
-	{
-		int i;
-		TiXmlNode* child = node->FirstChild();
-		for (	i=0;
-				child && i<count;
-				child = child->NextSibling(), ++i )
-		{
-			// nothing
-		}
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
-}
-
-
-TiXmlHandle TiXmlHandle::Child( const char* value, int count ) const
-{
-	if ( node )
-	{
-		int i;
-		TiXmlNode* child = node->FirstChild( value );
-		for (	i=0;
-				child && i<count;
-				child = child->NextSibling( value ), ++i )
-		{
-			// nothing
-		}
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
-}
-
-
-TiXmlHandle TiXmlHandle::ChildElement( int count ) const
-{
-	if ( node )
-	{
-		int i;
-		TiXmlElement* child = node->FirstChildElement();
-		for (	i=0;
-				child && i<count;
-				child = child->NextSiblingElement(), ++i )
-		{
-			// nothing
-		}
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
-}
-
-
-TiXmlHandle TiXmlHandle::ChildElement( const char* value, int count ) const
-{
-	if ( node )
-	{
-		int i;
-		TiXmlElement* child = node->FirstChildElement( value );
-		for (	i=0;
-				child && i<count;
-				child = child->NextSiblingElement( value ), ++i )
-		{
-			// nothing
-		}
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
-}
-
-
-bool TiXmlPrinter::VisitEnter( const TiXmlDocument& )
-{
-	return true;
-}
-
-bool TiXmlPrinter::VisitExit( const TiXmlDocument& )
-{
-	return true;
-}
-
-bool TiXmlPrinter::VisitEnter( const TiXmlElement& element, const TiXmlAttribute* firstAttribute )
-{
-	DoIndent();
-	buffer += "<";
-	buffer += element.Value();
-
-	for( const TiXmlAttribute* attrib = firstAttribute; attrib; attrib = attrib->Next() )
-	{
-		buffer += " ";
-		attrib->Print( 0, 0, &buffer );
-	}
-
-	if ( !element.FirstChild() ) 
-	{
-		buffer += " />";
-		DoLineBreak();
-	}
-	else 
-	{
-		buffer += ">";
-		if ( element.FirstChild()->ToText()
-			 && element.LastChild() == element.FirstChild()
-			 && element.FirstChild()->ToText()->CDATA() == false )
-		{
-			simpleTextPrint = true;
-			// no DoLineBreak()!
-		}
-		else
-		{
-			DoLineBreak();
-		}
-	}
-	++depth;	
-	return true;
-}
-
-
-bool TiXmlPrinter::VisitExit( const TiXmlElement& element )
-{
-	--depth;
-	if ( !element.FirstChild() ) 
-	{
-		// nothing.
-	}
-	else 
-	{
-		if ( simpleTextPrint )
-		{
-			simpleTextPrint = false;
-		}
-		else
-		{
-			DoIndent();
-		}
-		buffer += "</";
-		buffer += element.Value();
-		buffer += ">";
-		DoLineBreak();
-	}
-	return true;
-}
-
-
-bool TiXmlPrinter::Visit( const TiXmlText& text )
-{
-	if ( text.CDATA() )
-	{
-		DoIndent();
-		buffer += "<!CDATA";
-		buffer += text.Value();
-		buffer += ">";
-		DoLineBreak();
-	}
-	else if ( simpleTextPrint )
-	{
-		TIXML_STRING str;
-		TiXmlBase::EncodeString( text.ValueTStr(), &str );
-		buffer += str;
-	}
-	else
-	{
-		DoIndent();
-		TIXML_STRING str;
-		TiXmlBase::EncodeString( text.ValueTStr(), &str );
-		buffer += str;
-		DoLineBreak();
-	}
-	return true;
-}
-
-
-bool TiXmlPrinter::Visit( const TiXmlDeclaration& declaration )
-{
-	DoIndent();
-	declaration.Print( 0, 0, &buffer );
-	DoLineBreak();
-	return true;
-}
-
-
-bool TiXmlPrinter::Visit( const TiXmlComment& comment )
-{
-	DoIndent();
-	buffer += "";
-	DoLineBreak();
-	return true;
-}
-
-
-bool TiXmlPrinter::Visit( const TiXmlUnknown& unknown )
-{
-	DoIndent();
-	buffer += "<";
-	buffer += unknown.Value();
-	buffer += ">";
-	DoLineBreak();
-	return true;
-}
-

libzen_0.4.22.tar.bz2/Source/ZenLib/TinyXml/tinyxml.h Deleted

@@ -1,1806 +0,0 @@
-/*
-www.sourceforge.net/projects/tinyxml
-Original code by Lee Thomason (www.grinninglizard.com)
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-*/
-
-
-#ifndef TINYXML_INCLUDED
-#define TINYXML_INCLUDED
-
-#ifdef _MSC_VER
-#pragma warning( push )
-#pragma warning( disable : 4530 )
-#pragma warning( disable : 4786 )
-#endif
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-// Help out windows:
-#if defined( _DEBUG ) && !defined( DEBUG )
-#define DEBUG
-#endif
-
-#define TIXML_USE_STL
-#ifdef TIXML_USE_STL
-	#include <string>
- 	#include <iostream>
-	#include <sstream>
-	#define TIXML_STRING		std::string
-#else
-	#include "tinystr.h"
-	#define TIXML_STRING		TiXmlString
-#endif
-
-// Deprecated library function hell. Compilers want to use the
-// new safe versions. This probably doesn't fully address the problem,
-// but it gets closer. There are too many compilers for me to fully
-// test. If you get compilation troubles, undefine TIXML_SAFE
-#define TIXML_SAFE
-
-#ifdef TIXML_SAFE
-	#if defined(_MSC_VER) && (_MSC_VER >= 1400 )
-		// Microsoft visual studio, version 2005 and higher.
-		#define TIXML_SNPRINTF _snprintf_s
-		#define TIXML_SSCANF sscanf_s
-	#elif defined(_MSC_VER) && (_MSC_VER >= 1200 )
-		// Microsoft visual studio, version 6 and higher.
-		//#pragma message( "Using _sn* functions." )
-		#define TIXML_SNPRINTF _snprintf
-		#define TIXML_SSCANF sscanf
-	#elif defined(__GNUC__) && (__GNUC__ >= 3 )
-		// GCC version 3 and higher.s
-		//#warning( "Using sn* functions." )
-		#define TIXML_SNPRINTF snprintf
-		#define TIXML_SSCANF sscanf
-	#else
-		#define TIXML_SNPRINTF snprintf
-		#define TIXML_SSCANF sscanf
-	#endif
-#endif	
-
-class TiXmlDocument;
-class TiXmlElement;
-class TiXmlComment;
-class TiXmlUnknown;
-class TiXmlAttribute;
-class TiXmlText;
-class TiXmlDeclaration;
-class TiXmlParsingData;
-
-const int TIXML_MAJOR_VERSION = 2;
-const int TIXML_MINOR_VERSION = 6;
-const int TIXML_PATCH_VERSION = 2;
-
-/*	Internal structure for tracking location of items 
-	in the XML file.
-*/
-struct TiXmlCursor
-{
-	TiXmlCursor()		{ Clear(); }
-	void Clear()		{ row = col = -1; }
-
-	int row;	// 0 based.
-	int col;	// 0 based.
-};
-
-
-/**
-	Implements the interface to the "Visitor pattern" (see the Accept() method.)
-	If you call the Accept() method, it requires being passed a TiXmlVisitor
-	class to handle callbacks. For nodes that contain other nodes (Document, Element)
-	you will get called with a VisitEnter/VisitExit pair. Nodes that are always leaves
-	are simply called with Visit().
-
-	If you return 'true' from a Visit method, recursive parsing will continue. If you return
-	false, no children of this node or its sibilings will be Visited.
-
-	All flavors of Visit methods have a default implementation that returns 'true' (continue 
-	visiting). You need to only override methods that are interesting to you.
-
-	Generally Accept() is called on the TiXmlDocument, although all nodes suppert Visiting.
-
-	You should never change the document from a callback.
-
-	@sa TiXmlNode::Accept()
-*/
-class TiXmlVisitor
-{
-public:
-	virtual ~TiXmlVisitor() {}
-
-	/// Visit a document.
-	virtual bool VisitEnter( const TiXmlDocument& /*doc*/ )			{ return true; }
-	/// Visit a document.
-	virtual bool VisitExit( const TiXmlDocument& /*doc*/ )			{ return true; }
-
-	/// Visit an element.
-	virtual bool VisitEnter( const TiXmlElement& /*element*/, const TiXmlAttribute* /*firstAttribute*/ )	{ return true; }
-	/// Visit an element.
-	virtual bool VisitExit( const TiXmlElement& /*element*/ )		{ return true; }
-
-	/// Visit a declaration
-	virtual bool Visit( const TiXmlDeclaration& /*declaration*/ )	{ return true; }
-	/// Visit a text node
-	virtual bool Visit( const TiXmlText& /*text*/ )					{ return true; }
-	/// Visit a comment node
-	virtual bool Visit( const TiXmlComment& /*comment*/ )			{ return true; }
-	/// Visit an unknown node
-	virtual bool Visit( const TiXmlUnknown& /*unknown*/ )			{ return true; }
-};
-
-// Only used by Attribute::Query functions
-enum 
-{ 
-	TIXML_SUCCESS,
-	TIXML_NO_ATTRIBUTE,
-	TIXML_WRONG_TYPE
-};
-
-
-// Used by the parsing routines.
-enum TiXmlEncoding
-{
-	TIXML_ENCODING_UNKNOWN,
-	TIXML_ENCODING_UTF8,
-	TIXML_ENCODING_LEGACY
-};
-
-const TiXmlEncoding TIXML_DEFAULT_ENCODING = TIXML_ENCODING_UNKNOWN;
-
-/** TiXmlBase is a base class for every class in TinyXml.
-	It does little except to establish that TinyXml classes
-	can be printed and provide some utility functions.
-
-	In XML, the document and elements can contain
-	other elements and other types of nodes.
-
-	@verbatim
-	A Document can contain:	Element	(container or leaf)
-							Comment (leaf)
-							Unknown (leaf)
-							Declaration( leaf )
-
-	An Element can contain:	Element (container or leaf)
-							Text	(leaf)
-							Attributes (not on tree)
-							Comment (leaf)
-							Unknown (leaf)
-
-	A Decleration contains: Attributes (not on tree)
-	@endverbatim
-*/
-class TiXmlBase
-{
-	friend class TiXmlNode;
-	friend class TiXmlElement;
-	friend class TiXmlDocument;
-
-public:
-	TiXmlBase()	:	userData(0)		{}
-	virtual ~TiXmlBase()			{}
-
-	/**	All TinyXml classes can print themselves to a filestream
-		or the string class (TiXmlString in non-STL mode, std::string
-		in STL mode.) Either or both cfile and str can be null.
-		
-		This is a formatted print, and will insert 
-		tabs and newlines.
-		
-		(For an unformatted stream, use the << operator.)
-	*/
-	virtual void Print( FILE* cfile, int depth ) const = 0;
-
-	/**	The world does not agree on whether white space should be kept or
-		not. In order to make everyone happy, these global, static functions
-		are provided to set whether or not TinyXml will condense all white space
-		into a single space or not. The default is to condense. Note changing this
-		value is not thread safe.
-	*/
-	static void SetCondenseWhiteSpace( bool condense )		{ condenseWhiteSpace = condense; }
-
-	/// Return the current white space setting.
-	static bool IsWhiteSpaceCondensed()						{ return condenseWhiteSpace; }
-
-	/** Return the position, in the original source file, of this node or attribute.
-		The row and column are 1-based. (That is the first row and first column is
-		1,1). If the returns values are 0 or less, then the parser does not have
-		a row and column value.
-
-		Generally, the row and column value will be set when the TiXmlDocument::Load(),
-		TiXmlDocument::LoadFile(), or any TiXmlNode::Parse() is called. It will NOT be set
-		when the DOM was created from operator>>.
-
-		The values reflect the initial load. Once the DOM is modified programmatically
-		(by adding or changing nodes and attributes) the new values will NOT update to
-		reflect changes in the document.
-
-		There is a minor performance cost to computing the row and column. Computation
-		can be disabled if TiXmlDocument::SetTabSize() is called with 0 as the value.
-
-		@sa TiXmlDocument::SetTabSize()
-	*/
-	int Row() const			{ return location.row + 1; }
-	int Column() const		{ return location.col + 1; }	///< See Row()
-
-	void SetUserData( void* user )			{ userData = user; }	///< Set a pointer to arbitrary user data.
-	void* GetUserData()						{ return userData; }	///< Get a pointer to arbitrary user data.
-	const void* GetUserData() const 		{ return userData; }	///< Get a pointer to arbitrary user data.
-
-	// Table that returs, for a given lead byte, the total number of bytes
-	// in the UTF-8 sequence.
-	static const int utf8ByteTable256;
-
-	virtual const char* Parse(	const char* p, 
-								TiXmlParsingData* data, 
-								TiXmlEncoding encoding /*= TIXML_ENCODING_UNKNOWN */ ) = 0;
-
-	/** Expands entities in a string. Note this should not contian the tag's '<', '>', etc, 
-		or they will be transformed into entities!
-	*/
-	static void EncodeString( const TIXML_STRING& str, TIXML_STRING* out );
-
-	enum
-	{
-		TIXML_NO_ERROR = 0,
-		TIXML_ERROR,
-		TIXML_ERROR_OPENING_FILE,
-		TIXML_ERROR_PARSING_ELEMENT,
-		TIXML_ERROR_FAILED_TO_READ_ELEMENT_NAME,
-		TIXML_ERROR_READING_ELEMENT_VALUE,
-		TIXML_ERROR_READING_ATTRIBUTES,
-		TIXML_ERROR_PARSING_EMPTY,
-		TIXML_ERROR_READING_END_TAG,
-		TIXML_ERROR_PARSING_UNKNOWN,
-		TIXML_ERROR_PARSING_COMMENT,
-		TIXML_ERROR_PARSING_DECLARATION,
-		TIXML_ERROR_DOCUMENT_EMPTY,
-		TIXML_ERROR_EMBEDDED_NULL,
-		TIXML_ERROR_PARSING_CDATA,
-		TIXML_ERROR_DOCUMENT_TOP_ONLY,
-
-		TIXML_ERROR_STRING_COUNT
-	};
-
-protected:
-
-	static const char* SkipWhiteSpace( const char*, TiXmlEncoding encoding );
-
-	inline static bool IsWhiteSpace( char c )		
-	{ 
-		return ( isspace( (unsigned char) c ) || c == '\n' || c == '\r' ); 
-	}
-	inline static bool IsWhiteSpace( int c )
-	{
-		if ( c < 256 )
-			return IsWhiteSpace( (char) c );
-		return false;	// Again, only truly correct for English/Latin...but usually works.
-	}
-
-	#ifdef TIXML_USE_STL
-	static bool	StreamWhiteSpace( std::istream * in, TIXML_STRING * tag );
-	static bool StreamTo( std::istream * in, int character, TIXML_STRING * tag );
-	#endif
-
-	/*	Reads an XML name into the string provided. Returns
-		a pointer just past the last character of the name,
-		or 0 if the function has an error.
-	*/
-	static const char* ReadName( const char* p, TIXML_STRING* name, TiXmlEncoding encoding );
-
-	/*	Reads text. Returns a pointer past the given end tag.
-		Wickedly complex options, but it keeps the (sensitive) code in one place.
-	*/
-	static const char* ReadText(	const char* in,				// where to start
-									TIXML_STRING* text,			// the string read
-									bool ignoreWhiteSpace,		// whether to keep the white space
-									const char* endTag,			// what ends this text
-									bool ignoreCase,			// whether to ignore case in the end tag
-									TiXmlEncoding encoding );	// the current encoding
-
-	// If an entity has been found, transform it into a character.
-	static const char* GetEntity( const char* in, char* value, int* length, TiXmlEncoding encoding );
-
-	// Get a character, while interpreting entities.
-	// The length can be from 0 to 4 bytes.
-	inline static const char* GetChar( const char* p, char* _value, int* length, TiXmlEncoding encoding )
-	{
-		assert( p );
-		if ( encoding == TIXML_ENCODING_UTF8 )
-		{
-			*length = utf8ByteTable *((const unsigned char*)p) ;
-			assert( *length >= 0 && *length < 5 );
-		}
-		else
-		{
-			*length = 1;
-		}
-
-		if ( *length == 1 )
-		{
-			if ( *p == '&' )
-				return GetEntity( p, _value, length, encoding );
-			*_value = *p;
-			return p+1;
-		}
-		else if ( *length )
-		{
-			//strncpy( _value, p, *length );	// lots of compilers don't like this function (unsafe),
-												// and the null terminator isn't needed
-			for( int i=0; pi && i<*length; ++i ) {
-				_valuei = pi;
-			}
-			return p + (*length);
-		}
-		else
-		{
-			// Not valid text.
-			return 0;
-		}
-	}
-
-	// Return true if the next characters in the stream are any of the endTag sequences.
-	// Ignore case only works for english, and should only be relied on when comparing
-	// to English words: StringEqual( p, "version", true ) is fine.
-	static bool StringEqual(	const char* p,
-								const char* endTag,
-								bool ignoreCase,
-								TiXmlEncoding encoding );
-
-	static const char* errorString TIXML_ERROR_STRING_COUNT ;
-
-	TiXmlCursor location;
-
- /// Field containing a generic user pointer
-	void*			userData;
-	
-	// None of these methods are reliable for any language except English.
-	// Good for approximation, not great for accuracy.
-	static int IsAlpha( unsigned char anyByte, TiXmlEncoding encoding );
-	static int IsAlphaNum( unsigned char anyByte, TiXmlEncoding encoding );
-	inline static int ToLower( int v, TiXmlEncoding encoding )
-	{
-		if ( encoding == TIXML_ENCODING_UTF8 )
-		{
-			if ( v < 128 ) return tolower( v );
-			return v;
-		}
-		else
-		{
-			return tolower( v );
-		}
-	}
-	static void ConvertUTF32ToUTF8( unsigned long input, char* output, int* length );
-
-private:
-	TiXmlBase( const TiXmlBase& );				// not implemented.
-	void operator=( const TiXmlBase& base );	// not allowed.
-
-	struct Entity
-	{
-		const char* str;
-		unsigned int	strLength;
-		char		 chr;
-	};
-	enum
-	{
-		NUM_ENTITY = 5,
-		MAX_ENTITY_LENGTH = 6
-
-	};
-	static Entity entity NUM_ENTITY ;
-	static bool condenseWhiteSpace;
-};
-
-
-/** The parent class for everything in the Document Object Model.
-	(Except for attributes).
-	Nodes have siblings, a parent, and children. A node can be
-	in a document, or stand on its own. The type of a TiXmlNode
-	can be queried, and it can be cast to its more defined type.
-*/
-class TiXmlNode : public TiXmlBase
-{
-	friend class TiXmlDocument;
-	friend class TiXmlElement;
-
-public:
-	#ifdef TIXML_USE_STL	
-
-	 /** An input stream operator, for every class. Tolerant of newlines and
-		 formatting, but doesn't expect them.
-	 */
-	 friend std::istream& operator >> (std::istream& in, TiXmlNode& base);
-
-	 /** An output stream operator, for every class. Note that this outputs
-		 without any newlines or formatting, as opposed to Print(), which
-		 includes tabs and new lines.
-
-		 The operator<< and operator>> are not completely symmetric. Writing
-		 a node to a stream is very well defined. You'll get a nice stream
-		 of output, without any extra whitespace or newlines.
-		 
-		 But reading is not as well defined. (As it always is.) If you create
-		 a TiXmlElement (for example) and read that from an input stream,
-		 the text needs to define an element or junk will result. This is
-		 true of all input streams, but it's worth keeping in mind.
-
-		 A TiXmlDocument will read nodes until it reads a root element, and
-			all the children of that root element.
-	 */	
-	 friend std::ostream& operator<< (std::ostream& out, const TiXmlNode& base);
-
-		/// Appends the XML node or attribute to a std::string.
-		friend std::string& operator<< (std::string& out, const TiXmlNode& base );
-
-	#endif
-
-	/** The types of XML nodes supported by TinyXml. (All the
-			unsupported types are picked up by UNKNOWN.)
-	*/
-	enum NodeType
-	{
-		TINYXML_DOCUMENT,
-		TINYXML_ELEMENT,
-		TINYXML_COMMENT,
-		TINYXML_UNKNOWN,
-		TINYXML_TEXT,
-		TINYXML_DECLARATION,
-		TINYXML_TYPECOUNT
-	};
-
-	virtual ~TiXmlNode();
-
-	/** The meaning of 'value' changes for the specific type of
-		TiXmlNode.
-		@verbatim
-		Document:	filename of the xml file
-		Element:	name of the element
-		Comment:	the comment text
-		Unknown:	the tag contents
-		Text:		the text string
-		@endverbatim
-
-		The subclasses will wrap this function.
-	*/
-	const char *Value() const { return value.c_str (); }
-
- #ifdef TIXML_USE_STL
-	/** Return Value() as a std::string. If you only use STL,
-	 this is more efficient than calling Value().
-		Only available in STL mode.
-	*/
-	const std::string& ValueStr() const { return value; }
-	#endif
-
-	const TIXML_STRING& ValueTStr() const { return value; }
-
-	/** Changes the value of the node. Defined as:
-		@verbatim
-		Document:	filename of the xml file
-		Element:	name of the element
-		Comment:	the comment text
-		Unknown:	the tag contents
-		Text:		the text string
-		@endverbatim
-	*/
-	void SetValue(const char * _value) { value = _value;}
-
- #ifdef TIXML_USE_STL
-	/// STL std::string form.
-	void SetValue( const std::string& _value )	{ value = _value; }
-	#endif
-
-	/// Delete all the children of this node. Does not affect 'this'.
-	void Clear();
-
-	/// One step up the DOM.
-	TiXmlNode* Parent()							{ return parent; }
-	const TiXmlNode* Parent() const				{ return parent; }
-
-	const TiXmlNode* FirstChild()	const		{ return firstChild; }	///< The first child of this node. Will be null if there are no children.
-	TiXmlNode* FirstChild()						{ return firstChild; }
-	const TiXmlNode* FirstChild( const char * value ) const;			///< The first child of this node with the matching 'value'. Will be null if none found.
-	/// The first child of this node with the matching 'value'. Will be null if none found.
-	TiXmlNode* FirstChild( const char * _value ) {
-		// Call through to the const version - safe since nothing is changed. Exiting syntax: cast this to a const (always safe)
-		// call the method, cast the return back to non-const.
-		return const_cast< TiXmlNode* > ((const_cast< const TiXmlNode* >(this))->FirstChild( _value ));
-	}
-	const TiXmlNode* LastChild() const	{ return lastChild; }		/// The last child of this node. Will be null if there are no children.
-	TiXmlNode* LastChild()	{ return lastChild; }
-	
-	const TiXmlNode* LastChild( const char * value ) const;			/// The last child of this node matching 'value'. Will be null if there are no children.
-	TiXmlNode* LastChild( const char * _value ) {
-		return const_cast< TiXmlNode* > ((const_cast< const TiXmlNode* >(this))->LastChild( _value ));
-	}
-
- #ifdef TIXML_USE_STL
-	const TiXmlNode* FirstChild( const std::string& _value ) const	{	return FirstChild (_value.c_str ());	}	///< STL std::string form.
-	TiXmlNode* FirstChild( const std::string& _value )				{	return FirstChild (_value.c_str ());	}	///< STL std::string form.
-	const TiXmlNode* LastChild( const std::string& _value ) const	{	return LastChild (_value.c_str ());	}	///< STL std::string form.
-	TiXmlNode* LastChild( const std::string& _value )				{	return LastChild (_value.c_str ());	}	///< STL std::string form.
-	#endif
-
-	/** An alternate way to walk the children of a node.
-		One way to iterate over nodes is:
-		@verbatim
-			for( child = parent->FirstChild(); child; child = child->NextSibling() )
-		@endverbatim
-
-		IterateChildren does the same thing with the syntax:
-		@verbatim
-			child = 0;
-			while( child = parent->IterateChildren( child ) )
-		@endverbatim
-
-		IterateChildren takes the previous child as input and finds
-		the next one. If the previous child is null, it returns the
-		first. IterateChildren will return null when done.
-	*/
-	const TiXmlNode* IterateChildren( const TiXmlNode* previous ) const;
-	TiXmlNode* IterateChildren( const TiXmlNode* previous ) {
-		return const_cast< TiXmlNode* >( (const_cast< const TiXmlNode* >(this))->IterateChildren( previous ) );
-	}
-
-	/// This flavor of IterateChildren searches for children with a particular 'value'
-	const TiXmlNode* IterateChildren( const char * value, const TiXmlNode* previous ) const;
-	TiXmlNode* IterateChildren( const char * _value, const TiXmlNode* previous ) {
-		return const_cast< TiXmlNode* >( (const_cast< const TiXmlNode* >(this))->IterateChildren( _value, previous ) );
-	}
-
- #ifdef TIXML_USE_STL
-	const TiXmlNode* IterateChildren( const std::string& _value, const TiXmlNode* previous ) const	{	return IterateChildren (_value.c_str (), previous);	}	///< STL std::string form.
-	TiXmlNode* IterateChildren( const std::string& _value, const TiXmlNode* previous ) {	return IterateChildren (_value.c_str (), previous);	}	///< STL std::string form.
-	#endif
-
-	/** Add a new node related to this. Adds a child past the LastChild.
-		Returns a pointer to the new object or NULL if an error occured.
-	*/
-	TiXmlNode* InsertEndChild( const TiXmlNode& addThis );
-
-
-	/** Add a new node related to this. Adds a child past the LastChild.
-
-		NOTE: the node to be added is passed by pointer, and will be
-		henceforth owned (and deleted) by tinyXml. This method is efficient
-		and avoids an extra copy, but should be used with care as it
-		uses a different memory model than the other insert functions.
-
-		@sa InsertEndChild
-	*/
-	TiXmlNode* LinkEndChild( TiXmlNode* addThis );
-
-	/** Add a new node related to this. Adds a child before the specified child.
-		Returns a pointer to the new object or NULL if an error occured.
-	*/
-	TiXmlNode* InsertBeforeChild( TiXmlNode* beforeThis, const TiXmlNode& addThis );
-
-	/** Add a new node related to this. Adds a child after the specified child.
-		Returns a pointer to the new object or NULL if an error occured.
-	*/
-	TiXmlNode* InsertAfterChild( TiXmlNode* afterThis, const TiXmlNode& addThis );
-
-	/** Replace a child of this node.
-		Returns a pointer to the new object or NULL if an error occured.
-	*/
-	TiXmlNode* ReplaceChild( TiXmlNode* replaceThis, const TiXmlNode& withThis );
-
-	/// Delete a child of this node.
-	bool RemoveChild( TiXmlNode* removeThis );
-
-	/// Navigate to a sibling node.
-	const TiXmlNode* PreviousSibling() const			{ return prev; }
-	TiXmlNode* PreviousSibling()						{ return prev; }
-
-	/// Navigate to a sibling node.
-	const TiXmlNode* PreviousSibling( const char * ) const;
-	TiXmlNode* PreviousSibling( const char *_prev ) {
-		return const_cast< TiXmlNode* >( (const_cast< const TiXmlNode* >(this))->PreviousSibling( _prev ) );
-	}
-
- #ifdef TIXML_USE_STL
-	const TiXmlNode* PreviousSibling( const std::string& _value ) const	{	return PreviousSibling (_value.c_str ());	}	///< STL std::string form.
-	TiXmlNode* PreviousSibling( const std::string& _value ) 			{	return PreviousSibling (_value.c_str ());	}	///< STL std::string form.
-	const TiXmlNode* NextSibling( const std::string& _value) const		{	return NextSibling (_value.c_str ());	}	///< STL std::string form.
-	TiXmlNode* NextSibling( const std::string& _value) 					{	return NextSibling (_value.c_str ());	}	///< STL std::string form.
-	#endif
-
-	/// Navigate to a sibling node.
-	const TiXmlNode* NextSibling() const				{ return next; }
-	TiXmlNode* NextSibling()							{ return next; }
-
-	/// Navigate to a sibling node with the given 'value'.
-	const TiXmlNode* NextSibling( const char * ) const;
-	TiXmlNode* NextSibling( const char* _next ) {
-		return const_cast< TiXmlNode* >( (const_cast< const TiXmlNode* >(this))->NextSibling( _next ) );
-	}
-
-	/** Convenience function to get through elements.
-		Calls NextSibling and ToElement. Will skip all non-Element
-		nodes. Returns 0 if there is not another element.
-	*/
-	const TiXmlElement* NextSiblingElement() const;
-	TiXmlElement* NextSiblingElement() {
-		return const_cast< TiXmlElement* >( (const_cast< const TiXmlNode* >(this))->NextSiblingElement() );
-	}
-
-	/** Convenience function to get through elements.
-		Calls NextSibling and ToElement. Will skip all non-Element
-		nodes. Returns 0 if there is not another element.
-	*/
-	const TiXmlElement* NextSiblingElement( const char * ) const;
-	TiXmlElement* NextSiblingElement( const char *_next ) {
-		return const_cast< TiXmlElement* >( (const_cast< const TiXmlNode* >(this))->NextSiblingElement( _next ) );
-	}
-
- #ifdef TIXML_USE_STL
-	const TiXmlElement* NextSiblingElement( const std::string& _value) const	{	return NextSiblingElement (_value.c_str ());	}	///< STL std::string form.
-	TiXmlElement* NextSiblingElement( const std::string& _value)				{	return NextSiblingElement (_value.c_str ());	}	///< STL std::string form.
-	#endif
-
-	/// Convenience function to get through elements.
-	const TiXmlElement* FirstChildElement()	const;
-	TiXmlElement* FirstChildElement() {
-		return const_cast< TiXmlElement* >( (const_cast< const TiXmlNode* >(this))->FirstChildElement() );
-	}
-
-	/// Convenience function to get through elements.
-	const TiXmlElement* FirstChildElement( const char * _value ) const;
-	TiXmlElement* FirstChildElement( const char * _value ) {
-		return const_cast< TiXmlElement* >( (const_cast< const TiXmlNode* >(this))->FirstChildElement( _value ) );
-	}
-
- #ifdef TIXML_USE_STL
-	const TiXmlElement* FirstChildElement( const std::string& _value ) const	{	return FirstChildElement (_value.c_str ());	}	///< STL std::string form.
-	TiXmlElement* FirstChildElement( const std::string& _value )				{	return FirstChildElement (_value.c_str ());	}	///< STL std::string form.
-	#endif
-
-	/** Query the type (as an enumerated value, above) of this node.
-		The possible types are: TINYXML_DOCUMENT, TINYXML_ELEMENT, TINYXML_COMMENT,
-								TINYXML_UNKNOWN, TINYXML_TEXT, and TINYXML_DECLARATION.
-	*/
-	int Type() const	{ return type; }
-
-	/** Return a pointer to the Document this node lives in.
-		Returns null if not in a document.
-	*/
-	const TiXmlDocument* GetDocument() const;
-	TiXmlDocument* GetDocument() {
-		return const_cast< TiXmlDocument* >( (const_cast< const TiXmlNode* >(this))->GetDocument() );
-	}
-
-	/// Returns true if this node has no children.
-	bool NoChildren() const						{ return !firstChild; }
-
-	virtual const TiXmlDocument* ToDocument() const { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-	virtual const TiXmlElement* ToElement() const { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-	virtual const TiXmlComment* ToComment() const { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-	virtual const TiXmlUnknown* ToUnknown() const { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-	virtual const TiXmlText* ToText() const { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-	virtual const TiXmlDeclaration* ToDeclaration() const { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-
-	virtual TiXmlDocument* ToDocument() { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-	virtual TiXmlElement* ToElement()	 { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-	virtual TiXmlComment* ToComment() { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-	virtual TiXmlUnknown* ToUnknown()	 { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-	virtual TiXmlText*	 ToText() { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-	virtual TiXmlDeclaration* ToDeclaration() { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-
-	/** Create an exact duplicate of this node and return it. The memory must be deleted
-		by the caller. 
-	*/
-	virtual TiXmlNode* Clone() const = 0;
-
-	/** Accept a hierchical visit the nodes in the TinyXML DOM. Every node in the 
-		XML tree will be conditionally visited and the host will be called back
-		via the TiXmlVisitor interface.
-
-		This is essentially a SAX interface for TinyXML. (Note however it doesn't re-parse
-		the XML for the callbacks, so the performance of TinyXML is unchanged by using this
-		interface versus any other.)
-
-		The interface has been based on ideas from:
-
-		- http://www.saxproject.org/
-		- http://c2.com/cgi/wiki?HierarchicalVisitorPattern 
-
-		Which are both good references for "visiting".
-
-		An example of using Accept():
-		@verbatim
-		TiXmlPrinter printer;
-		tinyxmlDoc.Accept( &printer );
-		const char* xmlcstr = printer.CStr();
-		@endverbatim
-	*/
-	virtual bool Accept( TiXmlVisitor* visitor ) const = 0;
-
-protected:
-	TiXmlNode( NodeType _type );
-
-	// Copy to the allocated object. Shared functionality between Clone, Copy constructor,
-	// and the assignment operator.
-	void CopyTo( TiXmlNode* target ) const;
-
-	#ifdef TIXML_USE_STL
-	 // The real work of the input operator.
-	virtual void StreamIn( std::istream* in, TIXML_STRING* tag ) = 0;
-	#endif
-
-	// Figure out what is at *p, and parse it. Returns null if it is not an xml node.
-	TiXmlNode* Identify( const char* start, TiXmlEncoding encoding );
-
-	TiXmlNode*		parent;
-	NodeType		type;
-
-	TiXmlNode*		firstChild;
-	TiXmlNode*		lastChild;
-
-	TIXML_STRING	value;
-
-	TiXmlNode*		prev;
-	TiXmlNode*		next;
-
-private:
-	TiXmlNode( const TiXmlNode& );				// not implemented.
-	void operator=( const TiXmlNode& base );	// not allowed.
-};
-
-
-/** An attribute is a name-value pair. Elements have an arbitrary
-	number of attributes, each with a unique name.
-
-	@note The attributes are not TiXmlNodes, since they are not
-		 part of the tinyXML document object model. There are other
-		 suggested ways to look at this problem.
-*/
-class TiXmlAttribute : public TiXmlBase
-{
-	friend class TiXmlAttributeSet;
-
-public:
-	/// Construct an empty attribute.
-	TiXmlAttribute() : TiXmlBase()
-	{
-		document = 0;
-		prev = next = 0;
-	}
-
-	#ifdef TIXML_USE_STL
-	/// std::string constructor.
-	TiXmlAttribute( const std::string& _name, const std::string& _value )
-	{
-		name = _name;
-		value = _value;
-		document = 0;
-		prev = next = 0;
-	}
-	#endif
-
-	/// Construct an attribute with a name and value.
-	TiXmlAttribute( const char * _name, const char * _value )
-	{
-		name = _name;
-		value = _value;
-		document = 0;
-		prev = next = 0;
-	}
-
-	const char*		Name() const		{ return name.c_str(); }		///< Return the name of this attribute.
-	const char*		Value() const		{ return value.c_str(); }		///< Return the value of this attribute.
-	#ifdef TIXML_USE_STL
-	const std::string& ValueStr() const	{ return value; }				///< Return the value of this attribute.
-	#endif
-	int				IntValue() const;									///< Return the value of this attribute, converted to an integer.
-	double			DoubleValue() const;								///< Return the value of this attribute, converted to a double.
-
-	// Get the tinyxml string representation
-	const TIXML_STRING& NameTStr() const { return name; }
-
-	/** QueryIntValue examines the value string. It is an alternative to the
-		IntValue() method with richer error checking.
-		If the value is an integer, it is stored in 'value' and 
-		the call returns TIXML_SUCCESS. If it is not
-		an integer, it returns TIXML_WRONG_TYPE.
-
-		A specialized but useful call. Note that for success it returns 0,
-		which is the opposite of almost all other TinyXml calls.
-	*/
-	int QueryIntValue( int* _value ) const;
-	/// QueryDoubleValue examines the value string. See QueryIntValue().
-	int QueryDoubleValue( double* _value ) const;
-
-	void SetName( const char* _name )	{ name = _name; }				///< Set the name of this attribute.
-	void SetValue( const char* _value )	{ value = _value; }				///< Set the value.
-
-	void SetIntValue( int _value );										///< Set the value from an integer.
-	void SetDoubleValue( double _value );								///< Set the value from a double.
-
- #ifdef TIXML_USE_STL
-	/// STL std::string form.
-	void SetName( const std::string& _name )	{ name = _name; }	
-	/// STL std::string form.	
-	void SetValue( const std::string& _value )	{ value = _value; }
-	#endif
-
-	/// Get the next sibling attribute in the DOM. Returns null at end.
-	const TiXmlAttribute* Next() const;
-	TiXmlAttribute* Next() {
-		return const_cast< TiXmlAttribute* >( (const_cast< const TiXmlAttribute* >(this))->Next() ); 
-	}
-
-	/// Get the previous sibling attribute in the DOM. Returns null at beginning.
-	const TiXmlAttribute* Previous() const;
-	TiXmlAttribute* Previous() {
-		return const_cast< TiXmlAttribute* >( (const_cast< const TiXmlAttribute* >(this))->Previous() ); 
-	}
-
-	bool operator==( const TiXmlAttribute& rhs ) const { return rhs.name == name; }
-	bool operator<( const TiXmlAttribute& rhs )	 const { return name < rhs.name; }
-	bool operator>( const TiXmlAttribute& rhs ) const { return name > rhs.name; }
-
-	/*	Attribute parsing starts: first letter of the name
-						 returns: the next char after the value end quote
-	*/
-	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
-
-	// Prints this Attribute to a FILE stream.
-	virtual void Print( FILE* cfile, int depth ) const {
-		Print( cfile, depth, 0 );
-	}
-	void Print( FILE* cfile, int depth, TIXML_STRING* str ) const;
-
-	// internal use
-	// Set the document pointer so the attribute can report errors.
-	void SetDocument( TiXmlDocument* doc )	{ document = doc; }
-
-private:
-	TiXmlAttribute( const TiXmlAttribute& );				// not implemented.
-	void operator=( const TiXmlAttribute& base );	// not allowed.
-
-	TiXmlDocument*	document;	// A pointer back to a document, for error reporting.
-	TIXML_STRING name;
-	TIXML_STRING value;
-	TiXmlAttribute*	prev;
-	TiXmlAttribute*	next;
-};
-
-
-/*	A class used to manage a group of attributes.
-	It is only used internally, both by the ELEMENT and the DECLARATION.
-	
-	The set can be changed transparent to the Element and Declaration
-	classes that use it, but NOT transparent to the Attribute
-	which has to implement a next() and previous() method. Which makes
-	it a bit problematic and prevents the use of STL.
-
-	This version is implemented with circular lists because:
-		- I like circular lists
-		- it demonstrates some independence from the (typical) doubly linked list.
-*/
-class TiXmlAttributeSet
-{
-public:
-	TiXmlAttributeSet();
-	~TiXmlAttributeSet();
-
-	void Add( TiXmlAttribute* attribute );
-	void Remove( TiXmlAttribute* attribute );
-
-	const TiXmlAttribute* First()	const	{ return ( sentinel.next == &sentinel ) ? 0 : sentinel.next; }
-	TiXmlAttribute* First()					{ return ( sentinel.next == &sentinel ) ? 0 : sentinel.next; }
-	const TiXmlAttribute* Last() const		{ return ( sentinel.prev == &sentinel ) ? 0 : sentinel.prev; }
-	TiXmlAttribute* Last()					{ return ( sentinel.prev == &sentinel ) ? 0 : sentinel.prev; }
-
-	TiXmlAttribute*	Find( const char* _name ) const;
-	TiXmlAttribute* FindOrCreate( const char* _name );
-
-#	ifdef TIXML_USE_STL
-	TiXmlAttribute*	Find( const std::string& _name ) const;
-	TiXmlAttribute* FindOrCreate( const std::string& _name );
-#	endif
-
-
-private:
-	//*ME:	Because of hidden/disabled copy-construktor in TiXmlAttribute (sentinel-element),
-	//*ME:	this class must be also use a hidden/disabled copy-constructor !!!
-	TiXmlAttributeSet( const TiXmlAttributeSet& );	// not allowed
-	void operator=( const TiXmlAttributeSet& );	// not allowed (as TiXmlAttribute)
-
-	TiXmlAttribute sentinel;
-};
-
-
-/** The element is a container class. It has a value, the element name,
-	and can contain other elements, text, comments, and unknowns.
-	Elements also contain an arbitrary number of attributes.
-*/
-class TiXmlElement : public TiXmlNode
-{
-public:
-	/// Construct an element.
-	TiXmlElement (const char * in_value);
-
-	#ifdef TIXML_USE_STL
-	/// std::string constructor.
-	TiXmlElement( const std::string& _value );
-	#endif
-
-	TiXmlElement( const TiXmlElement& );
-
-	TiXmlElement& operator=( const TiXmlElement& base );
-
-	virtual ~TiXmlElement();
-
-	/** Given an attribute name, Attribute() returns the value
-		for the attribute of that name, or null if none exists.
-	*/
-	const char* Attribute( const char* name ) const;
-
-	/** Given an attribute name, Attribute() returns the value
-		for the attribute of that name, or null if none exists.
-		If the attribute exists and can be converted to an integer,
-		the integer value will be put in the return 'i', if 'i'
-		is non-null.
-	*/
-	const char* Attribute( const char* name, int* i ) const;
-
-	/** Given an attribute name, Attribute() returns the value
-		for the attribute of that name, or null if none exists.
-		If the attribute exists and can be converted to an double,
-		the double value will be put in the return 'd', if 'd'
-		is non-null.
-	*/
-	const char* Attribute( const char* name, double* d ) const;
-
-	/** QueryIntAttribute examines the attribute - it is an alternative to the
-		Attribute() method with richer error checking.
-		If the attribute is an integer, it is stored in 'value' and 
-		the call returns TIXML_SUCCESS. If it is not
-		an integer, it returns TIXML_WRONG_TYPE. If the attribute
-		does not exist, then TIXML_NO_ATTRIBUTE is returned.
-	*/	
-	int QueryIntAttribute( const char* name, int* _value ) const;
-	/// QueryUnsignedAttribute examines the attribute - see QueryIntAttribute().
-	int QueryUnsignedAttribute( const char* name, unsigned* _value ) const;
-	/** QueryBoolAttribute examines the attribute - see QueryIntAttribute(). 
-		Note that '1', 'true', or 'yes' are considered true, while '0', 'false'
-		and 'no' are considered false.
-	*/
-	int QueryBoolAttribute( const char* name, bool* _value ) const;
-	/// QueryDoubleAttribute examines the attribute - see QueryIntAttribute().
-	int QueryDoubleAttribute( const char* name, double* _value ) const;
-	/// QueryFloatAttribute examines the attribute - see QueryIntAttribute().
-	int QueryFloatAttribute( const char* name, float* _value ) const {
-		double d;
-		int result = QueryDoubleAttribute( name, &d );
-		if ( result == TIXML_SUCCESS ) {
-			*_value = (float)d;
-		}
-		return result;
-	}
-
- #ifdef TIXML_USE_STL
-	/// QueryStringAttribute examines the attribute - see QueryIntAttribute().
-	int QueryStringAttribute( const char* name, std::string* _value ) const {
-		const char* cstr = Attribute( name );
-		if ( cstr ) {
-			*_value = std::string( cstr );
-			return TIXML_SUCCESS;
-		}
-		return TIXML_NO_ATTRIBUTE;
-	}
-
-	/** Template form of the attribute query which will try to read the
-		attribute into the specified type. Very easy, very powerful, but
-		be careful to make sure to call this with the correct type.
-		
-		NOTE: This method doesn't work correctly for 'string' types that contain spaces.
-
-		@return TIXML_SUCCESS, TIXML_WRONG_TYPE, or TIXML_NO_ATTRIBUTE
-	*/
-	template< typename T > int QueryValueAttribute( const std::string& name, T* outValue ) const
-	{
-		const TiXmlAttribute* node = attributeSet.Find( name );
-		if ( !node )
-			return TIXML_NO_ATTRIBUTE;
-
-		std::stringstream sstream( node->ValueStr() );
-		sstream >> *outValue;
-		if ( !sstream.fail() )
-			return TIXML_SUCCESS;
-		return TIXML_WRONG_TYPE;
-	}
-
-	int QueryValueAttribute( const std::string& name, std::string* outValue ) const
-	{
-		const TiXmlAttribute* node = attributeSet.Find( name );
-		if ( !node )
-			return TIXML_NO_ATTRIBUTE;
-		*outValue = node->ValueStr();
-		return TIXML_SUCCESS;
-	}
-	#endif
-
-	/** Sets an attribute of name to a given value. The attribute
-		will be created if it does not exist, or changed if it does.
-	*/
-	void SetAttribute( const char* name, const char * _value );
-
- #ifdef TIXML_USE_STL
-	const std::string* Attribute( const std::string& name ) const;
-	const std::string* Attribute( const std::string& name, int* i ) const;
-	const std::string* Attribute( const std::string& name, double* d ) const;
-	int QueryIntAttribute( const std::string& name, int* _value ) const;
-	int QueryDoubleAttribute( const std::string& name, double* _value ) const;
-
-	/// STL std::string form.
-	void SetAttribute( const std::string& name, const std::string& _value );
-	///< STL std::string form.
-	void SetAttribute( const std::string& name, int _value );
-	///< STL std::string form.
-	void SetDoubleAttribute( const std::string& name, double value );
-	#endif
-
-	/** Sets an attribute of name to a given value. The attribute
-		will be created if it does not exist, or changed if it does.
-	*/
-	void SetAttribute( const char * name, int value );
-
-	/** Sets an attribute of name to a given value. The attribute
-		will be created if it does not exist, or changed if it does.
-	*/
-	void SetDoubleAttribute( const char * name, double value );
-
-	/** Deletes an attribute with the given name.
-	*/
-	void RemoveAttribute( const char * name );
- #ifdef TIXML_USE_STL
-	void RemoveAttribute( const std::string& name )	{	RemoveAttribute (name.c_str ());	}	///< STL std::string form.
-	#endif
-
-	const TiXmlAttribute* FirstAttribute() const	{ return attributeSet.First(); }		///< Access the first attribute in this element.
-	TiXmlAttribute* FirstAttribute() 				{ return attributeSet.First(); }
-	const TiXmlAttribute* LastAttribute()	const 	{ return attributeSet.Last(); }		///< Access the last attribute in this element.
-	TiXmlAttribute* LastAttribute()					{ return attributeSet.Last(); }
-
-	/** Convenience function for easy access to the text inside an element. Although easy
-		and concise, GetText() is limited compared to getting the TiXmlText child
-		and accessing it directly.
-	
-		If the first child of 'this' is a TiXmlText, the GetText()
-		returns the character string of the Text node, else null is returned.
-
-		This is a convenient method for getting the text of simple contained text:
-		@verbatim
-		<foo>This is text</foo>
-		const char* str = fooElement->GetText();
-		@endverbatim
-
-		'str' will be a pointer to "This is text". 
-		
-		Note that this function can be misleading. If the element foo was created from
-		this XML:
-		@verbatim
-		<foo>This is text</foo> 
-		@endverbatim
-
-		then the value of str would be null. The first child node isn't a text node, it is
-		another element. From this XML:
-		@verbatim
-		<foo>This is text</foo> 
-		@endverbatim
-		GetText() will return "This is ".
-
-		WARNING: GetText() accesses a child node - don't become confused with the 
-				 similarly named TiXmlHandle::Text() and TiXmlNode::ToText() which are 
-				 safe type casts on the referenced node.
-	*/
-	const char* GetText() const;
-
-	/// Creates a new Element and returns it - the returned element is a copy.
-	virtual TiXmlNode* Clone() const;
-	// Print the Element to a FILE stream.
-	virtual void Print( FILE* cfile, int depth ) const;
-
-	/*	Attribtue parsing starts: next char past '<'
-						 returns: next char past '>'
-	*/
-	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
-
-	virtual const TiXmlElement* ToElement() const { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
-	virtual TiXmlElement* ToElement()	 { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
-
-	/** Walk the XML tree visiting this node and all of its children. 
-	*/
-	virtual bool Accept( TiXmlVisitor* visitor ) const;
-
-protected:
-
-	void CopyTo( TiXmlElement* target ) const;
-	void ClearThis();	// like clear, but initializes 'this' object as well
-
-	// Used to be public internal use
-	#ifdef TIXML_USE_STL
-	virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
-	#endif
-	/*	internal use
-		Reads the "value" of the element -- another element, or text.
-		This should terminate with the current end tag.
-	*/
-	const char* ReadValue( const char* in, TiXmlParsingData* prevData, TiXmlEncoding encoding );
-
-private:
-	TiXmlAttributeSet attributeSet;
-};
-
-
-/**	An XML comment.
-*/
-class TiXmlComment : public TiXmlNode
-{
-public:
-	/// Constructs an empty comment.
-	TiXmlComment() : TiXmlNode( TiXmlNode::TINYXML_COMMENT ) {}
-	/// Construct a comment from text.
-	TiXmlComment( const char* _value ) : TiXmlNode( TiXmlNode::TINYXML_COMMENT ) {
-		SetValue( _value );
-	}
-	TiXmlComment( const TiXmlComment& );
-	TiXmlComment& operator=( const TiXmlComment& base );
-
-	virtual ~TiXmlComment()	{}
-
-	/// Returns a copy of this Comment.
-	virtual TiXmlNode* Clone() const;
-	// Write this Comment to a FILE stream.
-	virtual void Print( FILE* cfile, int depth ) const;
-
-	/*	Attribtue parsing starts: at the ! of the !--
-						 returns: next char past '>'
-	*/
-	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
-
-	virtual const TiXmlComment* ToComment() const	{ return this; } ///< Cast to a more defined type. Will return null not of the requested type.
-	virtual		 TiXmlComment* ToComment()		{ return this; } ///< Cast to a more defined type. Will return null not of the requested type.
-
-	/** Walk the XML tree visiting this node and all of its children. 
-	*/
-	virtual bool Accept( TiXmlVisitor* visitor ) const;
-
-protected:
-	void CopyTo( TiXmlComment* target ) const;
-
-	// used to be public
-	#ifdef TIXML_USE_STL
-	virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
-	#endif
-//	virtual void StreamOut( TIXML_OSTREAM * out ) const;
-
-private:
-
-};
-
-
-/** XML text. A text node can have 2 ways to output the next. "normal" output 
-	and CDATA. It will default to the mode it was parsed from the XML file and
-	you generally want to leave it alone, but you can change the output mode with 
-	SetCDATA() and query it with CDATA().
-*/
-class TiXmlText : public TiXmlNode
-{
-	friend class TiXmlElement;
-public:
-	/** Constructor for text element. By default, it is treated as 
-		normal, encoded text. If you want it be output as a CDATA text
-		element, set the parameter _cdata to 'true'
-	*/
-	TiXmlText (const char * initValue ) : TiXmlNode (TiXmlNode::TINYXML_TEXT)
-	{
-		SetValue( initValue );
-		cdata = false;
-	}
-	virtual ~TiXmlText() {}
-
-	#ifdef TIXML_USE_STL
-	/// Constructor.
-	TiXmlText( const std::string& initValue ) : TiXmlNode (TiXmlNode::TINYXML_TEXT)
-	{
-		SetValue( initValue );
-		cdata = false;
-	}
-	#endif
-
-	TiXmlText( const TiXmlText& copy ) : TiXmlNode( TiXmlNode::TINYXML_TEXT )	{ copy.CopyTo( this ); }
-	TiXmlText& operator=( const TiXmlText& base )							 	{ base.CopyTo( this ); return *this; }
-
-	// Write this text object to a FILE stream.
-	virtual void Print( FILE* cfile, int depth ) const;
-
-	/// Queries whether this represents text using a CDATA section.
-	bool CDATA() const				{ return cdata; }
-	/// Turns on or off a CDATA representation of text.
-	void SetCDATA( bool _cdata )	{ cdata = _cdata; }
-
-	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
-
-	virtual const TiXmlText* ToText() const { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
-	virtual TiXmlText* ToText() { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
-
-	/** Walk the XML tree visiting this node and all of its children. 
-	*/
-	virtual bool Accept( TiXmlVisitor* content ) const;
-
-protected :
-	/// internal use Creates a new Element and returns it.
-	virtual TiXmlNode* Clone() const;
-	void CopyTo( TiXmlText* target ) const;
-
-	bool Blank() const;	// returns true if all white space and new lines
-	// internal use
-	#ifdef TIXML_USE_STL
-	virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
-	#endif
-
-private:
-	bool cdata;			// true if this should be input and output as a CDATA style text element
-};
-
-
-/** In correct XML the declaration is the first entry in the file.
-	@verbatim
-		<?xml version="1.0" standalone="yes"?>
-	@endverbatim
-
-	TinyXml will happily read or write files without a declaration,
-	however. There are 3 possible attributes to the declaration:
-	version, encoding, and standalone.
-
-	Note: In this version of the code, the attributes are
-	handled as special cases, not generic attributes, simply
-	because there can only be at most 3 and they are always the same.
-*/
-class TiXmlDeclaration : public TiXmlNode
-{
-public:
-	/// Construct an empty declaration.
-	TiXmlDeclaration() : TiXmlNode( TiXmlNode::TINYXML_DECLARATION ) {}
-
-#ifdef TIXML_USE_STL
-	/// Constructor.
-	TiXmlDeclaration(	const std::string& _version,
-						const std::string& _encoding,
-						const std::string& _standalone );
-#endif
-
-	/// Construct.
-	TiXmlDeclaration(	const char* _version,
-						const char* _encoding,
-						const char* _standalone );
-
-	TiXmlDeclaration( const TiXmlDeclaration& copy );
-	TiXmlDeclaration& operator=( const TiXmlDeclaration& copy );
-
-	virtual ~TiXmlDeclaration()	{}
-
-	/// Version. Will return an empty string if none was found.
-	const char *Version() const			{ return version.c_str (); }
-	/// Encoding. Will return an empty string if none was found.
-	const char *Encoding() const		{ return encoding.c_str (); }
-	/// Is this a standalone document?
-	const char *Standalone() const		{ return standalone.c_str (); }
-
-	/// Creates a copy of this Declaration and returns it.
-	virtual TiXmlNode* Clone() const;
-	// Print this declaration to a FILE stream.
-	virtual void Print( FILE* cfile, int depth, TIXML_STRING* str ) const;
-	virtual void Print( FILE* cfile, int depth ) const {
-		Print( cfile, depth, 0 );
-	}
-
-	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
-
-	virtual const TiXmlDeclaration* ToDeclaration() const { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
-	virtual TiXmlDeclaration* ToDeclaration() { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
-
-	/** Walk the XML tree visiting this node and all of its children. 
-	*/
-	virtual bool Accept( TiXmlVisitor* visitor ) const;
-
-protected:
-	void CopyTo( TiXmlDeclaration* target ) const;
-	// used to be public
-	#ifdef TIXML_USE_STL
-	virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
-	#endif
-
-private:
-
-	TIXML_STRING version;
-	TIXML_STRING encoding;
-	TIXML_STRING standalone;
-};
-
-
-/** Any tag that tinyXml doesn't recognize is saved as an
-	unknown. It is a tag of text, but should not be modified.
-	It will be written back to the XML, unchanged, when the file
-	is saved.
-
-	DTD tags get thrown into TiXmlUnknowns.
-*/
-class TiXmlUnknown : public TiXmlNode
-{
-public:
-	TiXmlUnknown() : TiXmlNode( TiXmlNode::TINYXML_UNKNOWN )	{}
-	virtual ~TiXmlUnknown() {}
-
-	TiXmlUnknown( const TiXmlUnknown& copy ) : TiXmlNode( TiXmlNode::TINYXML_UNKNOWN )		{ copy.CopyTo( this ); }
-	TiXmlUnknown& operator=( const TiXmlUnknown& copy )										{ copy.CopyTo( this ); return *this; }
-
-	/// Creates a copy of this Unknown and returns it.
-	virtual TiXmlNode* Clone() const;
-	// Print this Unknown to a FILE stream.
-	virtual void Print( FILE* cfile, int depth ) const;
-
-	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
-
-	virtual const TiXmlUnknown* ToUnknown() const	{ return this; } ///< Cast to a more defined type. Will return null not of the requested type.
-	virtual TiXmlUnknown* ToUnknown()				{ return this; } ///< Cast to a more defined type. Will return null not of the requested type.
-
-	/** Walk the XML tree visiting this node and all of its children. 
-	*/
-	virtual bool Accept( TiXmlVisitor* content ) const;
-
-protected:
-	void CopyTo( TiXmlUnknown* target ) const;
-
-	#ifdef TIXML_USE_STL
-	virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
-	#endif
-
-private:
-
-};
-
-
-/** Always the top level node. A document binds together all the
-	XML pieces. It can be saved, loaded, and printed to the screen.
-	The 'value' of a document node is the xml file name.
-*/
-class TiXmlDocument : public TiXmlNode
-{
-public:
-	/// Create an empty document, that has no name.
-	TiXmlDocument();
-	/// Create a document with a name. The name of the document is also the filename of the xml.
-	TiXmlDocument( const char * documentName );
-
-	#ifdef TIXML_USE_STL
-	/// Constructor.
-	TiXmlDocument( const std::string& documentName );
-	#endif
-
-	TiXmlDocument( const TiXmlDocument& copy );
-	TiXmlDocument& operator=( const TiXmlDocument& copy );
-
-	virtual ~TiXmlDocument() {}
-
-	/** Load a file using the current document value.
-		Returns true if successful. Will delete any existing
-		document data before loading.
-	*/
-	bool LoadFile( TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING );
-	/// Save a file using the current document value. Returns true if successful.
-	bool SaveFile() const;
-	/// Load a file using the given filename. Returns true if successful.
-	bool LoadFile( const char * filename, TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING );
-	/// Save a file using the given filename. Returns true if successful.
-	bool SaveFile( const char * filename ) const;
-	/** Load a file using the given FILE*. Returns true if successful. Note that this method
-		doesn't stream - the entire object pointed at by the FILE*
-		will be interpreted as an XML file. TinyXML doesn't stream in XML from the current
-		file location. Streaming may be added in the future.
-	*/
-	bool LoadFile( FILE*, TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING );
-	/// Save a file using the given FILE*. Returns true if successful.
-	bool SaveFile( FILE* ) const;
-
-	#ifdef TIXML_USE_STL
-	bool LoadFile( const std::string& filename, TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING )			///< STL std::string version.
-	{
-		return LoadFile( filename.c_str(), encoding );
-	}
-	bool SaveFile( const std::string& filename ) const		///< STL std::string version.
-	{
-		return SaveFile( filename.c_str() );
-	}
-	#endif
-
-	/** Parse the given null terminated block of xml data. Passing in an encoding to this
-		method (either TIXML_ENCODING_LEGACY or TIXML_ENCODING_UTF8 will force TinyXml
-		to use that encoding, regardless of what TinyXml might otherwise try to detect.
-	*/
-	virtual const char* Parse( const char* p, TiXmlParsingData* data = 0, TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING );
-
-	/** Get the root element -- the only top level element -- of the document.
-		In well formed XML, there should only be one. TinyXml is tolerant of
-		multiple elements at the document level.
-	*/
-	const TiXmlElement* RootElement() const		{ return FirstChildElement(); }
-	TiXmlElement* RootElement()					{ return FirstChildElement(); }
-
-	/** If an error occurs, Error will be set to true. Also,
-		- The ErrorId() will contain the integer identifier of the error (not generally useful)
-		- The ErrorDesc() method will return the name of the error. (very useful)
-		- The ErrorRow() and ErrorCol() will return the location of the error (if known)
-	*/	
-	bool Error() const						{ return error; }
-
-	/// Contains a textual (english) description of the error if one occurs.
-	const char * ErrorDesc() const	{ return errorDesc.c_str (); }
-
-	/** Generally, you probably want the error string ( ErrorDesc() ). But if you
-		prefer the ErrorId, this function will fetch it.
-	*/
-	int ErrorId()	const				{ return errorId; }
-
-	/** Returns the location (if known) of the error. The first column is column 1, 
-		and the first row is row 1. A value of 0 means the row and column wasn't applicable
-		(memory errors, for example, have no row/column) or the parser lost the error. (An
-		error in the error reporting, in that case.)
-
-		@sa SetTabSize, Row, Column
-	*/
-	int ErrorRow() const	{ return errorLocation.row+1; }
-	int ErrorCol() const	{ return errorLocation.col+1; }	///< The column where the error occured. See ErrorRow()
-
-	/** SetTabSize() allows the error reporting functions (ErrorRow() and ErrorCol())
-		to report the correct values for row and column. It does not change the output
-		or input in any way.
-		
-		By calling this method, with a tab size
-		greater than 0, the row and column of each node and attribute is stored
-		when the file is loaded. Very useful for tracking the DOM back in to
-		the source file.
-
-		The tab size is required for calculating the location of nodes. If not
-		set, the default of 4 is used. The tabsize is set per document. Setting
-		the tabsize to 0 disables row/column tracking.
-
-		Note that row and column tracking is not supported when using operator>>.
-
-		The tab size needs to be enabled before the parse or load. Correct usage:
-		@verbatim
-		TiXmlDocument doc;
-		doc.SetTabSize( 8 );
-		doc.Load( "myfile.xml" );
-		@endverbatim
-
-		@sa Row, Column
-	*/
-	void SetTabSize( int _tabsize )		{ tabsize = _tabsize; }
-
-	int TabSize() const	{ return tabsize; }
-
-	/** If you have handled the error, it can be reset with this call. The error
-		state is automatically cleared if you Parse a new XML block.
-	*/
-	void ClearError()						{	error = false; 
-												errorId = 0; 
-												errorDesc = ""; 
-												errorLocation.row = errorLocation.col = 0; 
-												//errorLocation.last = 0; 
-											}
-
-	/** Write the document to standard out using formatted printing ("pretty print"). */
-	void Print() const						{ Print( stdout, 0 ); }
-
-	/* Write the document to a string using formatted printing ("pretty print"). This
-		will allocate a character array (new char) and return it as a pointer. The
-		calling code pust call delete on the return char* to avoid a memory leak.
-	*/
-	//char* PrintToMemory() const; 
-
-	/// Print this Document to a FILE stream.
-	virtual void Print( FILE* cfile, int depth = 0 ) const;
-	// internal use
-	void SetError( int err, const char* errorLocation, TiXmlParsingData* prevData, TiXmlEncoding encoding );
-
-	virtual const TiXmlDocument* ToDocument() const { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
-	virtual TiXmlDocument* ToDocument() { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
-
-	/** Walk the XML tree visiting this node and all of its children. 
-	*/
-	virtual bool Accept( TiXmlVisitor* content ) const;
-
-protected :
-	// internal use
-	virtual TiXmlNode* Clone() const;
-	#ifdef TIXML_USE_STL
-	virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
-	#endif
-
-private:
-	void CopyTo( TiXmlDocument* target ) const;
-
-	bool error;
-	int errorId;
-	TIXML_STRING errorDesc;
-	int tabsize;
-	TiXmlCursor errorLocation;
-	bool useMicrosoftBOM;		// the UTF-8 BOM were found when read. Note this, and try to write.
-};
-
-
-/**
-	A TiXmlHandle is a class that wraps a node pointer with null checks; this is
-	an incredibly useful thing. Note that TiXmlHandle is not part of the TinyXml
-	DOM structure. It is a separate utility class.
-
-	Take an example:
-	@verbatim
-	<Document>
-		<Element attributeA = "valueA">
-			<Child attributeB = "value1" />
-			<Child attributeB = "value2" />
-		</Element>
-	<Document>
-	@endverbatim
-
-	Assuming you want the value of "attributeB" in the 2nd "Child" element, it's very 
-	easy to write a *lot* of code that looks like:
-
-	@verbatim
-	TiXmlElement* root = document.FirstChildElement( "Document" );
-	if ( root )
-	{
-		TiXmlElement* element = root->FirstChildElement( "Element" );
-		if ( element )
-		{
-			TiXmlElement* child = element->FirstChildElement( "Child" );
-			if ( child )
-			{
-				TiXmlElement* child2 = child->NextSiblingElement( "Child" );
-				if ( child2 )
-				{
-					// Finally do something useful.
-	@endverbatim
-
-	And that doesn't even cover "else" cases. TiXmlHandle addresses the verbosity
-	of such code. A TiXmlHandle checks for null	pointers so it is perfectly safe 
-	and correct to use:
-
-	@verbatim
-	TiXmlHandle docHandle( &document );
-	TiXmlElement* child2 = docHandle.FirstChild( "Document" ).FirstChild( "Element" ).Child( "Child", 1 ).ToElement();
-	if ( child2 )
-	{
-		// do something useful
-	@endverbatim
-
-	Which is MUCH more concise and useful.
-
-	It is also safe to copy handles - internally they are nothing more than node pointers.
-	@verbatim
-	TiXmlHandle handleCopy = handle;
-	@endverbatim
-
-	What they should not be used for is iteration:
-
-	@verbatim
-	int i=0; 
-	while ( true )
-	{
-		TiXmlElement* child = docHandle.FirstChild( "Document" ).FirstChild( "Element" ).Child( "Child", i ).ToElement();
-		if ( !child )
-			break;
-		// do something
-		++i;
-	}
-	@endverbatim
-
-	It seems reasonable, but it is in fact two embedded while loops. The Child method is 
-	a linear walk to find the element, so this code would iterate much more than it needs 
-	to. Instead, prefer:
-
-	@verbatim
-	TiXmlElement* child = docHandle.FirstChild( "Document" ).FirstChild( "Element" ).FirstChild( "Child" ).ToElement();
-
-	for( child; child; child=child->NextSiblingElement() )
-	{
-		// do something
-	}
-	@endverbatim
-*/
-class TiXmlHandle
-{
-public:
-	/// Create a handle from any node (at any depth of the tree.) This can be a null pointer.
-	TiXmlHandle( TiXmlNode* _node )					{ this->node = _node; }
-	/// Copy constructor
-	TiXmlHandle( const TiXmlHandle& ref )			{ this->node = ref.node; }
-	TiXmlHandle operator=( const TiXmlHandle& ref ) { if ( &ref != this ) this->node = ref.node; return *this; }
-
-	/// Return a handle to the first child node.
-	TiXmlHandle FirstChild() const;
-	/// Return a handle to the first child node with the given name.
-	TiXmlHandle FirstChild( const char * value ) const;
-	/// Return a handle to the first child element.
-	TiXmlHandle FirstChildElement() const;
-	/// Return a handle to the first child element with the given name.
-	TiXmlHandle FirstChildElement( const char * value ) const;
-
-	/** Return a handle to the "index" child with the given name. 
-		The first child is 0, the second 1, etc.
-	*/
-	TiXmlHandle Child( const char* value, int index ) const;
-	/** Return a handle to the "index" child. 
-		The first child is 0, the second 1, etc.
-	*/
-	TiXmlHandle Child( int index ) const;
-	/** Return a handle to the "index" child element with the given name. 
-		The first child element is 0, the second 1, etc. Note that only TiXmlElements
-		are indexed: other types are not counted.
-	*/
-	TiXmlHandle ChildElement( const char* value, int index ) const;
-	/** Return a handle to the "index" child element. 
-		The first child element is 0, the second 1, etc. Note that only TiXmlElements
-		are indexed: other types are not counted.
-	*/
-	TiXmlHandle ChildElement( int index ) const;
-
-	#ifdef TIXML_USE_STL
-	TiXmlHandle FirstChild( const std::string& _value ) const				{ return FirstChild( _value.c_str() ); }
-	TiXmlHandle FirstChildElement( const std::string& _value ) const		{ return FirstChildElement( _value.c_str() ); }
-
-	TiXmlHandle Child( const std::string& _value, int index ) const			{ return Child( _value.c_str(), index ); }
-	TiXmlHandle ChildElement( const std::string& _value, int index ) const	{ return ChildElement( _value.c_str(), index ); }
-	#endif
-
-	/** Return the handle as a TiXmlNode. This may return null.
-	*/
-	TiXmlNode* ToNode() const			{ return node; } 
-	/** Return the handle as a TiXmlElement. This may return null.
-	*/
-	TiXmlElement* ToElement() const		{ return ( ( node && node->ToElement() ) ? node->ToElement() : 0 ); }
-	/**	Return the handle as a TiXmlText. This may return null.
-	*/
-	TiXmlText* ToText() const			{ return ( ( node && node->ToText() ) ? node->ToText() : 0 ); }
-	/** Return the handle as a TiXmlUnknown. This may return null.
-	*/
-	TiXmlUnknown* ToUnknown() const		{ return ( ( node && node->ToUnknown() ) ? node->ToUnknown() : 0 ); }
-
-	/** @deprecated use ToNode. 
-		Return the handle as a TiXmlNode. This may return null.
-	*/
-	TiXmlNode* Node() const			{ return ToNode(); } 
-	/** @deprecated use ToElement. 
-		Return the handle as a TiXmlElement. This may return null.
-	*/
-	TiXmlElement* Element() const	{ return ToElement(); }
-	/**	@deprecated use ToText()
-		Return the handle as a TiXmlText. This may return null.
-	*/
-	TiXmlText* Text() const			{ return ToText(); }
-	/** @deprecated use ToUnknown()
-		Return the handle as a TiXmlUnknown. This may return null.
-	*/
-	TiXmlUnknown* Unknown() const	{ return ToUnknown(); }
-
-private:
-	TiXmlNode* node;
-};
-
-
-/** Print to memory functionality. The TiXmlPrinter is useful when you need to:
-
-	-# Print to memory (especially in non-STL mode)
-	-# Control formatting (line endings, etc.)
-
-	When constructed, the TiXmlPrinter is in its default "pretty printing" mode.
-	Before calling Accept() you can call methods to control the printing
-	of the XML document. After TiXmlNode::Accept() is called, the printed document can
-	be accessed via the CStr(), Str(), and Size() methods.
-
-	TiXmlPrinter uses the Visitor API.
-	@verbatim
-	TiXmlPrinter printer;
-	printer.SetIndent( "\t" );
-
-	doc.Accept( &printer );
-	fprintf( stdout, "%s", printer.CStr() );
-	@endverbatim
-*/
-class TiXmlPrinter : public TiXmlVisitor
-{
-public:
-	TiXmlPrinter() : depth( 0 ), simpleTextPrint( false ),
-					 buffer(), indent( " " ), lineBreak( "\n" ) {}
-
-	virtual bool VisitEnter( const TiXmlDocument& doc );
-	virtual bool VisitExit( const TiXmlDocument& doc );
-
-	virtual bool VisitEnter( const TiXmlElement& element, const TiXmlAttribute* firstAttribute );
-	virtual bool VisitExit( const TiXmlElement& element );
-
-	virtual bool Visit( const TiXmlDeclaration& declaration );
-	virtual bool Visit( const TiXmlText& text );
-	virtual bool Visit( const TiXmlComment& comment );
-	virtual bool Visit( const TiXmlUnknown& unknown );
-
-	/** Set the indent characters for printing. By default 4 spaces
-		but tab (\t) is also useful, or null/empty string for no indentation.
-	*/
-	void SetIndent( const char* _indent )			{ indent = _indent ? _indent : "" ; }
-	/// Query the indention string.
-	const char* Indent()							{ return indent.c_str(); }
-	/** Set the line breaking string. By default set to newline (\n). 
-		Some operating systems prefer other characters, or can be
-		set to the null/empty string for no indenation.
-	*/
-	void SetLineBreak( const char* _lineBreak )		{ lineBreak = _lineBreak ? _lineBreak : ""; }
-	/// Query the current line breaking string.
-	const char* LineBreak()							{ return lineBreak.c_str(); }
-
-	/** Switch over to "stream printing" which is the most dense formatting without 
-		linebreaks. Common when the XML is needed for network transmission.
-	*/
-	void SetStreamPrinting()						{ indent = "";
-													 lineBreak = "";
-													}	
-	/// Return the result.
-	const char* CStr()								{ return buffer.c_str(); }
-	/// Return the length of the result string.
-	size_t Size()									{ return buffer.size(); }
-
-	#ifdef TIXML_USE_STL
-	/// Return the result.
-	const std::string& Str()						{ return buffer; }
-	#endif
-
-private:
-	void DoIndent()	{
-		for( int i=0; i<depth; ++i )
-			buffer += indent;
-	}
-	void DoLineBreak() {
-		buffer += lineBreak;
-	}
-
-	int depth;
-	bool simpleTextPrint;
-	TIXML_STRING buffer;
-	TIXML_STRING indent;
-	TIXML_STRING lineBreak;
-};
-
-
-#ifdef _MSC_VER
-#pragma warning( pop )
-#endif
-
-#endif

libzen_0.4.22.tar.bz2/Source/ZenLib/TinyXml/tinyxmlerror.cpp Deleted

@@ -1,52 +0,0 @@
-/*
-www.sourceforge.net/projects/tinyxml
-Original code (2.0 and earlier )copyright (c) 2000-2006 Lee Thomason (www.grinninglizard.com)
-
-This software is provided 'as-is', without any express or implied 
-warranty. In no event will the authors be held liable for any 
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any 
-purpose, including commercial applications, and to alter it and 
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-*/
-
-#include "tinyxml.h"
-
-// The goal of the seperate error file is to make the first
-// step towards localization. tinyxml (currently) only supports
-// english error messages, but the could now be translated.
-//
-// It also cleans up the code a bit.
-//
-
-const char* TiXmlBase::errorString TiXmlBase::TIXML_ERROR_STRING_COUNT  =
-{
-	"No error",
-	"Error",
-	"Failed to open file",
-	"Error parsing Element.",
-	"Failed to read Element name",
-	"Error reading Element value.",
-	"Error reading Attributes.",
-	"Error: empty tag.",
-	"Error reading end tag.",
-	"Error parsing Unknown.",
-	"Error parsing Comment.",
-	"Error parsing Declaration.",
-	"Error document empty.",
-	"Error null (0) or unexpected EOF found in input stream.",
-	"Error parsing CDATA.",
-	"Error when TiXmlDocument added to document, because TiXmlDocument can only be at the root.",
-};

libzen_0.4.22.tar.bz2/Source/ZenLib/TinyXml/tinyxmlparser.cpp Deleted

@@ -1,1638 +0,0 @@
-/*
-www.sourceforge.net/projects/tinyxml
-Original code by Lee Thomason (www.grinninglizard.com)
-
-This software is provided 'as-is', without any express or implied 
-warranty. In no event will the authors be held liable for any 
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any 
-purpose, including commercial applications, and to alter it and 
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must 
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and 
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source 
-distribution.
-*/
-
-#include <ctype.h>
-#include <stddef.h>
-
-#include "tinyxml.h"
-
-//#define DEBUG_PARSER
-#if defined( DEBUG_PARSER )
-#	if defined( DEBUG ) && defined( _MSC_VER )
-#		include <windows.h>
-#		define TIXML_LOG OutputDebugString
-#	else
-#		define TIXML_LOG printf
-#	endif
-#endif
-
-// Note tha "PutString" hardcodes the same list. This
-// is less flexible than it appears. Changing the entries
-// or order will break putstring.	
-TiXmlBase::Entity TiXmlBase::entity TiXmlBase::NUM_ENTITY = 
-{
-	{ "&amp;", 5, '&' },
-	{ "&lt;", 4, '<' },
-	{ "&gt;", 4, '>' },
-	{ "&quot;", 6, '\"' },
-	{ "&apos;", 6, '\'' }
-};
-
-// Bunch of unicode info at:
-//		http://www.unicode.org/faq/utf_bom.html
-// Including the basic of this table, which determines the #bytes in the
-// sequence from the lead byte. 1 placed for invalid sequences --
-// although the result will be junk, pass it through as much as possible.
-// Beware of the non-characters in UTF-8:	
-//				ef bb bf (Microsoft "lead bytes")
-//				ef bf be
-//				ef bf bf 
-
-const unsigned char TIXML_UTF_LEAD_0 = 0xefU;
-const unsigned char TIXML_UTF_LEAD_1 = 0xbbU;
-const unsigned char TIXML_UTF_LEAD_2 = 0xbfU;
-
-const int TiXmlBase::utf8ByteTable256 = 
-{
-	//	0	1	2	3	4	5	6	7	8	9	a	b	c	d	e	f
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x00
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x10
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x20
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x30
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x40
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x50
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x60
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x70	End of ASCII range
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x80 0x80 to 0xc1 invalid
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x90 
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0xa0 
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0xb0 
-		1,	1,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	// 0xc0 0xc2 to 0xdf 2 byte
-		2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	// 0xd0
-		3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	// 0xe0 0xe0 to 0xef 3 byte
-		4,	4,	4,	4,	4,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1	// 0xf0 0xf0 to 0xf4 4 byte, 0xf5 and higher invalid
-};
-
-
-void TiXmlBase::ConvertUTF32ToUTF8( unsigned long input, char* output, int* length )
-{
-	const unsigned long BYTE_MASK = 0xBF;
-	const unsigned long BYTE_MARK = 0x80;
-	const unsigned long FIRST_BYTE_MARK7 = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
-
-	if (input < 0x80) 
-		*length = 1;
-	else if ( input < 0x800 )
-		*length = 2;
-	else if ( input < 0x10000 )
-		*length = 3;
-	else if ( input < 0x200000 )
-		*length = 4;
-	else
-		{ *length = 0; return; }	// This code won't covert this correctly anyway.
-
-	output += *length;
-
-	// Scary scary fall throughs.
-	switch (*length) 
-	{
-		case 4:
-			--output; 
-			*output = (char)((input | BYTE_MARK) & BYTE_MASK); 
-			input >>= 6;
-		case 3:
-			--output; 
-			*output = (char)((input | BYTE_MARK) & BYTE_MASK); 
-			input >>= 6;
-		case 2:
-			--output; 
-			*output = (char)((input | BYTE_MARK) & BYTE_MASK); 
-			input >>= 6;
-		case 1:
-			--output; 
-			*output = (char)(input | FIRST_BYTE_MARK*length);
-	}
-}
-
-
-/*static*/ int TiXmlBase::IsAlpha( unsigned char anyByte, TiXmlEncoding /*encoding*/ )
-{
-	// This will only work for low-ascii, everything else is assumed to be a valid
-	// letter. I'm not sure this is the best approach, but it is quite tricky trying
-	// to figure out alhabetical vs. not across encoding. So take a very 
-	// conservative approach.
-
-//	if ( encoding == TIXML_ENCODING_UTF8 )
-//	{
-		if ( anyByte < 127 )
-			return isalpha( anyByte );
-		else
-			return 1;	// What else to do? The unicode set is huge...get the english ones right.
-//	}
-//	else
-//	{
-//		return isalpha( anyByte );
-//	}
-}
-
-
-/*static*/ int TiXmlBase::IsAlphaNum( unsigned char anyByte, TiXmlEncoding /*encoding*/ )
-{
-	// This will only work for low-ascii, everything else is assumed to be a valid
-	// letter. I'm not sure this is the best approach, but it is quite tricky trying
-	// to figure out alhabetical vs. not across encoding. So take a very 
-	// conservative approach.
-
-//	if ( encoding == TIXML_ENCODING_UTF8 )
-//	{
-		if ( anyByte < 127 )
-			return isalnum( anyByte );
-		else
-			return 1;	// What else to do? The unicode set is huge...get the english ones right.
-//	}
-//	else
-//	{
-//		return isalnum( anyByte );
-//	}
-}
-
-
-class TiXmlParsingData
-{
-	friend class TiXmlDocument;
- public:
-	void Stamp( const char* now, TiXmlEncoding encoding );
-
-	const TiXmlCursor& Cursor() const	{ return cursor; }
-
- private:
-	// Only used by the document!
-	TiXmlParsingData( const char* start, int _tabsize, int row, int col )
-	{
-		assert( start );
-		stamp = start;
-		tabsize = _tabsize;
-		cursor.row = row;
-		cursor.col = col;
-	}
-
-	TiXmlCursor		cursor;
-	const char*		stamp;
-	int				tabsize;
-};
-
-
-void TiXmlParsingData::Stamp( const char* now, TiXmlEncoding encoding )
-{
-	assert( now );
-
-	// Do nothing if the tabsize is 0.
-	if ( tabsize < 1 )
-	{
-		return;
-	}
-
-	// Get the current row, column.
-	int row = cursor.row;
-	int col = cursor.col;
-	const char* p = stamp;
-	assert( p );
-
-	while ( p < now )
-	{
-		// Treat p as unsigned, so we have a happy compiler.
-		const unsigned char* pU = (const unsigned char*)p;
-
-		// Code contributed by Fletcher Dunn: (modified by lee)
-		switch (*pU) {
-			case 0:
-				// We *should* never get here, but in case we do, don't
-				// advance past the terminating null character, ever
-				return;
-
-			case '\r':
-				// bump down to the next line
-				++row;
-				col = 0;				
-				// Eat the character
-				++p;
-
-				// Check for \r\n sequence, and treat this as a single character
-				if (*p == '\n') {
-					++p;
-				}
-				break;
-
-			case '\n':
-				// bump down to the next line
-				++row;
-				col = 0;
-
-				// Eat the character
-				++p;
-
-				// Check for \n\r sequence, and treat this as a single
-				// character. (Yes, this bizarre thing does occur still
-				// on some arcane platforms...)
-				if (*p == '\r') {
-					++p;
-				}
-				break;
-
-			case '\t':
-				// Eat the character
-				++p;
-
-				// Skip to next tab stop
-				col = (col / tabsize + 1) * tabsize;
-				break;
-
-			case TIXML_UTF_LEAD_0:
-				if ( encoding == TIXML_ENCODING_UTF8 )
-				{
-					if ( *(p+1) && *(p+2) )
-					{
-						// In these cases, don't advance the column. These are
-						// 0-width spaces.
-						if ( *(pU+1)==TIXML_UTF_LEAD_1 && *(pU+2)==TIXML_UTF_LEAD_2 )
-							p += 3;	
-						else if ( *(pU+1)==0xbfU && *(pU+2)==0xbeU )
-							p += 3;	
-						else if ( *(pU+1)==0xbfU && *(pU+2)==0xbfU )
-							p += 3;	
-						else
-							{ p +=3; ++col; }	// A normal character.
-					}
-				}
-				else
-				{
-					++p;
-					++col;
-				}
-				break;
-
-			default:
-				if ( encoding == TIXML_ENCODING_UTF8 )
-				{
-					// Eat the 1 to 4 byte utf8 character.
-					int step = TiXmlBase::utf8ByteTable*((const unsigned char*)p);
-					if ( step == 0 )
-						step = 1;		// Error case from bad encoding, but handle gracefully.
-					p += step;
-
-					// Just advance one column, of course.
-					++col;
-				}
-				else
-				{
-					++p;
-					++col;
-				}
-				break;
-		}
-	}
-	cursor.row = row;
-	cursor.col = col;
-	assert( cursor.row >= -1 );
-	assert( cursor.col >= -1 );
-	stamp = p;
-	assert( stamp );
-}
-
-
-const char* TiXmlBase::SkipWhiteSpace( const char* p, TiXmlEncoding encoding )
-{
-	if ( !p || !*p )
-	{
-		return 0;
-	}
-	if ( encoding == TIXML_ENCODING_UTF8 )
-	{
-		while ( *p )
-		{
-			const unsigned char* pU = (const unsigned char*)p;
-			
-			// Skip the stupid Microsoft UTF-8 Byte order marks
-			if (	*(pU+0)==TIXML_UTF_LEAD_0
-				 && *(pU+1)==TIXML_UTF_LEAD_1 
-				 && *(pU+2)==TIXML_UTF_LEAD_2 )
-			{
-				p += 3;
-				continue;
-			}
-			else if(*(pU+0)==TIXML_UTF_LEAD_0
-				 && *(pU+1)==0xbfU
-				 && *(pU+2)==0xbeU )
-			{
-				p += 3;
-				continue;
-			}
-			else if(*(pU+0)==TIXML_UTF_LEAD_0
-				 && *(pU+1)==0xbfU
-				 && *(pU+2)==0xbfU )
-			{
-				p += 3;
-				continue;
-			}
-
-			if ( IsWhiteSpace( *p ) )		// Still using old rules for white space.
-				++p;
-			else
-				break;
-		}
-	}
-	else
-	{
-		while ( *p && IsWhiteSpace( *p ) )
-			++p;
-	}
-
-	return p;
-}
-
-#ifdef TIXML_USE_STL
-/*static*/ bool TiXmlBase::StreamWhiteSpace( std::istream * in, TIXML_STRING * tag )
-{
-	for( ;; )
-	{
-		if ( !in->good() ) return false;
-
-		int c = in->peek();
-		// At this scope, we can't get to a document. So fail silently.
-		if ( !IsWhiteSpace( c ) || c <= 0 )
-			return true;
-
-		*tag += (char) in->get();
-	}
-}
-
-/*static*/ bool TiXmlBase::StreamTo( std::istream * in, int character, TIXML_STRING * tag )
-{
-	//assert( character > 0 && character < 128 );	// else it won't work in utf-8
-	while ( in->good() )
-	{
-		int c = in->peek();
-		if ( c == character )
-			return true;
-		if ( c <= 0 )		// Silent failure: can't get document at this scope
-			return false;
-
-		in->get();
-		*tag += (char) c;
-	}
-	return false;
-}
-#endif
-
-// One of TinyXML's more performance demanding functions. Try to keep the memory overhead down. The
-// "assign" optimization removes over 10% of the execution time.
-//
-const char* TiXmlBase::ReadName( const char* p, TIXML_STRING * name, TiXmlEncoding encoding )
-{
-	// Oddly, not supported on some comilers,
-	//name->clear();
-	// So use this:
-	*name = "";
-	assert( p );
-
-	// Names start with letters or underscores.
-	// Of course, in unicode, tinyxml has no idea what a letter *is*. The
-	// algorithm is generous.
-	//
-	// After that, they can be letters, underscores, numbers,
-	// hyphens, or colons. (Colons are valid ony for namespaces,
-	// but tinyxml can't tell namespaces from names.)
-	if ( p && *p 
-		 && ( IsAlpha( (unsigned char) *p, encoding ) || *p == '_' ) )
-	{
-		const char* start = p;
-		while(		p && *p
-				&&	(		IsAlphaNum( (unsigned char ) *p, encoding ) 
-						 || *p == '_'
-						 || *p == '-'
-						 || *p == '.'
-						 || *p == ':' ) )
-		{
-			//(*name) += *p; // expensive
-			++p;
-		}
-		if ( p-start > 0 ) {
-			name->assign( start, p-start );
-		}
-		return p;
-	}
-	return 0;
-}
-
-const char* TiXmlBase::GetEntity( const char* p, char* value, int* length, TiXmlEncoding encoding )
-{
-	// Presume an entity, and pull it out.
- TIXML_STRING ent;
-	int i;
-	*length = 0;
-
-	if ( *(p+1) && *(p+1) == '#' && *(p+2) )
-	{
-		unsigned long ucs = 0;
-		ptrdiff_t delta = 0;
-		unsigned mult = 1;
-
-		if ( *(p+2) == 'x' )
-		{
-			// Hexadecimal.
-			if ( !*(p+3) ) return 0;
-
-			const char* q = p+3;
-			q = strchr( q, ';' );
-
-			if ( !q || !*q ) return 0;
-
-			delta = q-p;
-			--q;
-
-			while ( *q != 'x' )
-			{
-				if ( *q >= '0' && *q <= '9' )
-					ucs += mult * (*q - '0');
-				else if ( *q >= 'a' && *q <= 'f' )
-					ucs += mult * (*q - 'a' + 10);
-				else if ( *q >= 'A' && *q <= 'F' )
-					ucs += mult * (*q - 'A' + 10 );
-				else 
-					return 0;
-				mult *= 16;
-				--q;
-			}
-		}
-		else
-		{
-			// Decimal.
-			if ( !*(p+2) ) return 0;
-
-			const char* q = p+2;
-			q = strchr( q, ';' );
-
-			if ( !q || !*q ) return 0;
-
-			delta = q-p;
-			--q;
-
-			while ( *q != '#' )
-			{
-				if ( *q >= '0' && *q <= '9' )
-					ucs += mult * (*q - '0');
-				else 
-					return 0;
-				mult *= 10;
-				--q;
-			}
-		}
-		if ( encoding == TIXML_ENCODING_UTF8 )
-		{
-			// convert the UCS to UTF-8
-			ConvertUTF32ToUTF8( ucs, value, length );
-		}
-		else
-		{
-			*value = (char)ucs;
-			*length = 1;
-		}
-		return p + delta + 1;
-	}
-
-	// Now try to match it.
-	for( i=0; i<NUM_ENTITY; ++i )
-	{
-		if ( strncmp( entityi.str, p, entityi.strLength ) == 0 )
-		{
-			assert( strlen( entityi.str ) == entityi.strLength );
-			*value = entityi.chr;
-			*length = 1;
-			return ( p + entityi.strLength );
-		}
-	}
-
-	// So it wasn't an entity, its unrecognized, or something like that.
-	*value = *p;	// Don't put back the last one, since we return it!
-	//*length = 1;	// Leave unrecognized entities - this doesn't really work.
-					// Just writes strange XML.
-	return p+1;
-}
-
-
-bool TiXmlBase::StringEqual( const char* p,
-							 const char* tag,
-							 bool ignoreCase,
-							 TiXmlEncoding encoding )
-{
-	assert( p );
-	assert( tag );
-	if ( !p || !*p )
-	{
-		assert( 0 );
-		return false;
-	}
-
-	const char* q = p;
-
-	if ( ignoreCase )
-	{
-		while ( *q && *tag && ToLower( *q, encoding ) == ToLower( *tag, encoding ) )
-		{
-			++q;
-			++tag;
-		}
-
-		if ( *tag == 0 )
-			return true;
-	}
-	else
-	{
-		while ( *q && *tag && *q == *tag )
-		{
-			++q;
-			++tag;
-		}
-
-		if ( *tag == 0 )		// Have we found the end of the tag, and everything equal?
-			return true;
-	}
-	return false;
-}
-
-const char* TiXmlBase::ReadText(	const char* p, 
-									TIXML_STRING * text, 
-									bool trimWhiteSpace, 
-									const char* endTag, 
-									bool caseInsensitive,
-									TiXmlEncoding encoding )
-{
- *text = "";
-	if ( !trimWhiteSpace			// certain tags always keep whitespace
-		 || !condenseWhiteSpace )	// if true, whitespace is always kept
-	{
-		// Keep all the white space.
-		while (	 p && *p
-				&& !StringEqual( p, endTag, caseInsensitive, encoding )
-			 )
-		{
-			int len;
-			char cArr4 = { 0, 0, 0, 0 };
-			p = GetChar( p, cArr, &len, encoding );
-			text->append( cArr, len );
-		}
-	}
-	else
-	{
-		bool whitespace = false;
-
-		// Remove leading white space:
-		p = SkipWhiteSpace( p, encoding );
-		while (	 p && *p
-				&& !StringEqual( p, endTag, caseInsensitive, encoding ) )
-		{
-			if ( *p == '\r' || *p == '\n' )
-			{
-				whitespace = true;
-				++p;
-			}
-			else if ( IsWhiteSpace( *p ) )
-			{
-				whitespace = true;
-				++p;
-			}
-			else
-			{
-				// If we've found whitespace, add it before the
-				// new character. Any whitespace just becomes a space.
-				if ( whitespace )
-				{
-					(*text) += ' ';
-					whitespace = false;
-				}
-				int len;
-				char cArr4 = { 0, 0, 0, 0 };
-				p = GetChar( p, cArr, &len, encoding );
-				if ( len == 1 )
-					(*text) += cArr0;	// more efficient
-				else
-					text->append( cArr, len );
-			}
-		}
-	}
-	if ( p && *p )
-		p += strlen( endTag );
-	return ( p && *p ) ? p : 0;
-}
-
-#ifdef TIXML_USE_STL
-
-void TiXmlDocument::StreamIn( std::istream * in, TIXML_STRING * tag )
-{
-	// The basic issue with a document is that we don't know what we're
-	// streaming. Read something presumed to be a tag (and hope), then
-	// identify it, and call the appropriate stream method on the tag.
-	//
-	// This "pre-streaming" will never read the closing ">" so the
-	// sub-tag can orient itself.
-
-	if ( !StreamTo( in, '<', tag ) ) 
-	{
-		SetError( TIXML_ERROR_PARSING_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return;
-	}
-
-	while ( in->good() )
-	{
-		int tagIndex = (int) tag->length();
-		while ( in->good() && in->peek() != '>' )
-		{
-			int c = in->get();
-			if ( c <= 0 )
-			{
-				SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
-				break;
-			}
-			(*tag) += (char) c;
-		}
-
-		if ( in->good() )
-		{
-			// We now have something we presume to be a node of 
-			// some sort. Identify it, and call the node to
-			// continue streaming.
-			TiXmlNode* node = Identify( tag->c_str() + tagIndex, TIXML_DEFAULT_ENCODING );
-
-			if ( node )
-			{
-				node->StreamIn( in, tag );
-				bool isElement = node->ToElement() != 0;
-				delete node;
-				node = 0;
-
-				// If this is the root element, we're done. Parsing will be
-				// done by the >> operator.
-				if ( isElement )
-				{
-					return;
-				}
-			}
-			else
-			{
-				SetError( TIXML_ERROR, 0, 0, TIXML_ENCODING_UNKNOWN );
-				return;
-			}
-		}
-	}
-	// We should have returned sooner.
-	SetError( TIXML_ERROR, 0, 0, TIXML_ENCODING_UNKNOWN );
-}
-
-#endif
-
-const char* TiXmlDocument::Parse( const char* p, TiXmlParsingData* prevData, TiXmlEncoding encoding )
-{
-	ClearError();
-
-	// Parse away, at the document level. Since a document
-	// contains nothing but other tags, most of what happens
-	// here is skipping white space.
-	if ( !p || !*p )
-	{
-		SetError( TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return 0;
-	}
-
-	// Note that, for a document, this needs to come
-	// before the while space skip, so that parsing
-	// starts from the pointer we are given.
-	location.Clear();
-	if ( prevData )
-	{
-		location.row = prevData->cursor.row;
-		location.col = prevData->cursor.col;
-	}
-	else
-	{
-		location.row = 0;
-		location.col = 0;
-	}
-	TiXmlParsingData data( p, TabSize(), location.row, location.col );
-	location = data.Cursor();
-
-	if ( encoding == TIXML_ENCODING_UNKNOWN )
-	{
-		// Check for the Microsoft UTF-8 lead bytes.
-		const unsigned char* pU = (const unsigned char*)p;
-		if (	*(pU+0) && *(pU+0) == TIXML_UTF_LEAD_0
-			 && *(pU+1) && *(pU+1) == TIXML_UTF_LEAD_1
-			 && *(pU+2) && *(pU+2) == TIXML_UTF_LEAD_2 )
-		{
-			encoding = TIXML_ENCODING_UTF8;
-			useMicrosoftBOM = true;
-		}
-	}
-
- p = SkipWhiteSpace( p, encoding );
-	if ( !p )
-	{
-		SetError( TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return 0;
-	}
-
-	while ( p && *p )
-	{
-		TiXmlNode* node = Identify( p, encoding );
-		if ( node )
-		{
-			p = node->Parse( p, &data, encoding );
-			LinkEndChild( node );
-		}
-		else
-		{
-			break;
-		}
-
-		// Did we get encoding info?
-		if ( encoding == TIXML_ENCODING_UNKNOWN
-			 && node->ToDeclaration() )
-		{
-			TiXmlDeclaration* dec = node->ToDeclaration();
-			const char* enc = dec->Encoding();
-			assert( enc );
-
-			if ( *enc == 0 )
-				encoding = TIXML_ENCODING_UTF8;
-			else if ( StringEqual( enc, "UTF-8", true, TIXML_ENCODING_UNKNOWN ) )
-				encoding = TIXML_ENCODING_UTF8;
-			else if ( StringEqual( enc, "UTF8", true, TIXML_ENCODING_UNKNOWN ) )
-				encoding = TIXML_ENCODING_UTF8;	// incorrect, but be nice
-			else 
-				encoding = TIXML_ENCODING_LEGACY;
-		}
-
-		p = SkipWhiteSpace( p, encoding );
-	}
-
-	// Was this empty?
-	if ( !firstChild ) {
-		SetError( TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, encoding );
-		return 0;
-	}
-
-	// All is well.
-	return p;
-}
-
-void TiXmlDocument::SetError( int err, const char* pError, TiXmlParsingData* data, TiXmlEncoding encoding )
-{	
-	// The first error in a chain is more accurate - don't set again!
-	if ( error )
-		return;
-
-	assert( err > 0 && err < TIXML_ERROR_STRING_COUNT );
-	error = true;
-	errorId = err;
-	errorDesc = errorString errorId ;
-
-	errorLocation.Clear();
-	if ( pError && data )
-	{
-		data->Stamp( pError, encoding );
-		errorLocation = data->Cursor();
-	}
-}
-
-
-TiXmlNode* TiXmlNode::Identify( const char* p, TiXmlEncoding encoding )
-{
-	TiXmlNode* returnNode = 0;
-
-	p = SkipWhiteSpace( p, encoding );
-	if( !p || !*p || *p != '<' )
-	{
-		return 0;
-	}
-
-	p = SkipWhiteSpace( p, encoding );
-
-	if ( !p || !*p )
-	{
-		return 0;
-	}
-
-	// What is this thing? 
-	// - Elements start with a letter or underscore, but xml is reserved.
-	// - Comments: ";
-
-	if ( !StringEqual( p, startTag, false, encoding ) )
-	{
-		if ( document )
-			document->SetError( TIXML_ERROR_PARSING_COMMENT, p, data, encoding );
-		return 0;
-	}
-	p += strlen( startTag );
-
-	// 1475201 TinyXML parses entities in comments
-	// Oops - ReadText doesn't work, because we don't want to parse the entities.
-	// p = ReadText( p, &value, false, endTag, false, encoding );
-	//
-	// from the XML spec:
-	/*
-	 Definition: Comments may appear anywhere in a document outside other markup; in addition, 
-	 they may appear within the document type declaration at places allowed by the grammar. 
-				 They are not part of the document's character data; an XML processor MAY, but need not, 
-				 make it possible for an application to retrieve the text of comments. For compatibility, 
-				 the string "--" (double-hyphen) MUST NOT occur within comments. Parameter entity 
-				 references MUST NOT be recognized within comments.
-
-				 An example of a comment:
-
-				 
-	*/
-
- value = "";
-	// Keep all the white space.
-	while (	p && *p && !StringEqual( p, endTag, false, encoding ) )
-	{
-		value.append( p, 1 );
-		++p;
-	}
-	if ( p && *p ) 
-		p += strlen( endTag );
-
-	return p;
-}
-
-
-const char* TiXmlAttribute::Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding )
-{
-	p = SkipWhiteSpace( p, encoding );
-	if ( !p || !*p ) return 0;
-
-	if ( data )
-	{
-		data->Stamp( p, encoding );
-		location = data->Cursor();
-	}
-	// Read the name, the '=' and the value.
-	const char* pErr = p;
-	p = ReadName( p, &name, encoding );
-	if ( !p || !*p )
-	{
-		if ( document ) document->SetError( TIXML_ERROR_READING_ATTRIBUTES, pErr, data, encoding );
-		return 0;
-	}
-	p = SkipWhiteSpace( p, encoding );
-	if ( !p || !*p || *p != '=' )
-	{
-		if ( document ) document->SetError( TIXML_ERROR_READING_ATTRIBUTES, p, data, encoding );
-		return 0;
-	}
-
-	++p;	// skip '='
-	p = SkipWhiteSpace( p, encoding );
-	if ( !p || !*p )
-	{
-		if ( document ) document->SetError( TIXML_ERROR_READING_ATTRIBUTES, p, data, encoding );
-		return 0;
-	}
-	
-	const char* end;
-	const char SINGLE_QUOTE = '\'';
-	const char DOUBLE_QUOTE = '\"';
-
-	if ( *p == SINGLE_QUOTE )
-	{
-		++p;
-		end = "\'";		// single quote in string
-		p = ReadText( p, &value, false, end, false, encoding );
-	}
-	else if ( *p == DOUBLE_QUOTE )
-	{
-		++p;
-		end = "\"";		// double quote in string
-		p = ReadText( p, &value, false, end, false, encoding );
-	}
-	else
-	{
-		// All attribute values should be in single or double quotes.
-		// But this is such a common error that the parser will try
-		// its best, even without them.
-		value = "";
-		while ( p && *p											// existence
-				&& !IsWhiteSpace( *p )								// whitespace
-				&& *p != '/' && *p != '>' )							// tag end
-		{
-			if ( *p == SINGLE_QUOTE || *p == DOUBLE_QUOTE ) {
-				// 1451649 Attribute values with trailing quotes not handled correctly
-				// We did not have an opening quote but seem to have a 
-				// closing one. Give up and throw an error.
-				if ( document ) document->SetError( TIXML_ERROR_READING_ATTRIBUTES, p, data, encoding );
-				return 0;
-			}
-			value += *p;
-			++p;
-		}
-	}
-	return p;
-}
-
-#ifdef TIXML_USE_STL
-void TiXmlText::StreamIn( std::istream * in, TIXML_STRING * tag )
-{
-	while ( in->good() )
-	{
-		int c = in->peek();	
-		if ( !cdata && (c == '<' ) ) 
-		{
-			return;
-		}
-		if ( c <= 0 )
-		{
-			TiXmlDocument* document = GetDocument();
-			if ( document )
-				document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
-			return;
-		}
-
-		(*tag) += (char) c;
-		in->get();	// "commits" the peek made above
-
-		if ( cdata && c == '>' && tag->size() >= 3 ) {
-			size_t len = tag->size();
-			if ( (*tag)len-2 == '' && (*tag)len-3 == '' ) {
-				// terminator of cdata.
-				return;
-			}
-		} 
-	}
-}
-#endif
-
-const char* TiXmlText::Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding )
-{
-	value = "";
-	TiXmlDocument* document = GetDocument();
-
-	if ( data )
-	{
-		data->Stamp( p, encoding );
-		location = data->Cursor();
-	}
-
-	const char* const startTag = "<!CDATA";
-	const char* const endTag = ">";
-
-	if ( cdata || StringEqual( p, startTag, false, encoding ) )
-	{
-		cdata = true;
-
-		if ( !StringEqual( p, startTag, false, encoding ) )
-		{
-			if ( document )
-				document->SetError( TIXML_ERROR_PARSING_CDATA, p, data, encoding );
-			return 0;
-		}
-		p += strlen( startTag );
-
-		// Keep all the white space, ignore the encoding, etc.
-		while (	 p && *p
-				&& !StringEqual( p, endTag, false, encoding )
-			 )
-		{
-			value += *p;
-			++p;
-		}
-
-		TIXML_STRING dummy; 
-		p = ReadText( p, &dummy, false, endTag, false, encoding );
-		return p;
-	}
-	else
-	{
-		bool ignoreWhite = true;
-
-		const char* end = "<";
-		p = ReadText( p, &value, ignoreWhite, end, false, encoding );
-		if ( p && *p )
-			return p-1;	// don't truncate the '<'
-		return 0;
-	}
-}
-
-#ifdef TIXML_USE_STL
-void TiXmlDeclaration::StreamIn( std::istream * in, TIXML_STRING * tag )
-{
-	while ( in->good() )
-	{
-		int c = in->get();
-		if ( c <= 0 )
-		{
-			TiXmlDocument* document = GetDocument();
-			if ( document )
-				document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
-			return;
-		}
-		(*tag) += (char) c;
-
-		if ( c == '>' )
-		{
-			// All is well.
-			return;
-		}
-	}
-}
-#endif
-
-const char* TiXmlDeclaration::Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding _encoding )
-{
-	p = SkipWhiteSpace( p, _encoding );
-	// Find the beginning, find the end, and look for
-	// the stuff in-between.
-	TiXmlDocument* document = GetDocument();
-	if ( !p || !*p || !StringEqual( p, "<?xml", true, _encoding ) )
-	{
-		if ( document ) document->SetError( TIXML_ERROR_PARSING_DECLARATION, 0, 0, _encoding );
-		return 0;
-	}
-	if ( data )
-	{
-		data->Stamp( p, _encoding );
-		location = data->Cursor();
-	}
-	p += 5;
-
-	version = "";
-	encoding = "";
-	standalone = "";
-
-	while ( p && *p )
-	{
-		if ( *p == '>' )
-		{
-			++p;
-			return p;
-		}
-
-		p = SkipWhiteSpace( p, _encoding );
-		if ( StringEqual( p, "version", true, _encoding ) )
-		{
-			TiXmlAttribute attrib;
-			p = attrib.Parse( p, data, _encoding );		
-			version = attrib.Value();
-		}
-		else if ( StringEqual( p, "encoding", true, _encoding ) )
-		{
-			TiXmlAttribute attrib;
-			p = attrib.Parse( p, data, _encoding );		
-			encoding = attrib.Value();
-		}
-		else if ( StringEqual( p, "standalone", true, _encoding ) )
-		{
-			TiXmlAttribute attrib;
-			p = attrib.Parse( p, data, _encoding );		
-			standalone = attrib.Value();
-		}
-		else
-		{
-			// Read over whatever it is.
-			while( p && *p && *p != '>' && !IsWhiteSpace( *p ) )
-				++p;
-		}
-	}
-	return 0;
-}
-
-bool TiXmlText::Blank() const
-{
-	for ( unsigned i=0; i<value.length(); i++ )
-		if ( !IsWhiteSpace( valuei ) )
-			return false;
-	return true;
-}
-

libzen_0.4.22.tar.bz2/debian/libzen0-dev.dirs Deleted

libzen_0.4.22.tar.bz2/debian/libzen0-dev.install Deleted

libzen_0.4.22.tar.bz2/History.txt -> libzen_0.4.28.tar.bz2/History.txt Changed

@@ -1,3 +1,45 @@
+Version 0.4.28, 2012-08-06
+--------------
++ Removing _T() in order to be compatible with LLVM compiler
+
+x Ztring: UTF-16 conversion routines crash if the provided string size is odd.
+x GNU: forcing stdc++ at link
+
+Version 0.4.27, 2012-05-22
+--------------
++ Better support of machines lacking of std::basic_stream
+x License text corrections
+
+Version 0.4.26, 2012-04-09
+--------------
++ Better support of machines lacking of std::stringstream
++ Better support of machines requesting explicit stdc++ library link option (e.g. some ARM embedded devices)
+
+Version 0.4.25, 2012-03-13
+--------------
++ Fast bitstream parser
++ Removing Win9X detection on 64-bit CPU
++ Ztring: integer to text conversion with radix=2
++ Updated Linux compilation scripts
+
+Version 0.4.24, 2012-01-24
+--------------
++ Convertion from ctime style date to ISO date
++ GNU: more generic test of size_t as a long (e.g. for s390)
+x Read of text arrays of data was not well done if separator is bigger than 1 character
+x UTF-8 to UCS4 conversion was buggy with 4-byte characters
+x LittleEndian2float80() was buggy
+x Removing TinyXml and Base64 from the package
+
+Version 0.4.23, 2011-11-10
+--------------
++ Loading of CSV or any 2-dimensional array is carriage return mode insensitive
++ Ztring: ISO_8859_2 support
++ File: Truncate method
+x Ztring: UTF-8 load/save using generic code instead of Windows functions (they don't work for all Unicode codes)
+x File: Crash with some unordered API calls
+x FileName: Name::Get() wrong behavior in some cases
+
 Version 0.4.22, 2011-09-23
 --------------
 + File size retrieval is dynamic = support of growing files (Windows)
@@ -349,12 +391,12 @@
 - I don't remember :(
 
 Bug fixes
-- 
+-
 
 Version 0.0.2.0 2003-07-25
 ---------------
 New
-- 
+-
 
 Bug fixes
-- 
+-

libzen_0.4.22.tar.bz2/License.txt -> libzen_0.4.28.tar.bz2/License.txt Changed

@@ -12,28 +12,4 @@
    appreciated but is not required.
 2. Altered source versions must be plainly marked as such, and must not be
    misrepresented as being the original software.
-
-   
-***
-
-
-TinyXML (included in ZenLib package) is released under the zlib license:
-
-This software is provided 'as-is', without any express or implied 
-warranty. In no event will the authors be held liable for any 
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any 
-purpose, including commercial applications, and to alter it and 
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must 
-not claim that you wrote the original software. If you use this 
-software in a product, an acknowledgment in the product documentation 
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and 
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source 
-distribution.
+3. This notice may not be removed or altered from any source distribution.
\ No newline at end of file

libzen_0.4.22.tar.bz2/Project/BCB/Library/ZenLib.cbproj -> libzen_0.4.28.tar.bz2/Project/BCB/Library/ZenLib.cbproj Changed

@@ -20,7 +20,7 @@
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base)'!=''">
 			<TLIB_PageSize>128</TLIB_PageSize>
-			<IncludePath>..\..\..\Source\ZenLib\TinyXml;..\..\..\Source\ZenLib;..\..\..\Source\ZenLib\Format\Http;..\..\..\Source\ZenLib\Format\Html;..\..\..\Source\ZenLib\HTTP_Client;$(IncludePath)</IncludePath>
+			<IncludePath>..\..\..\Source\ZenLib\;..\..\..\Source\ZenLib\Format\Http\;..\..\..\Source\ZenLib\Format\Html\;..\..\..\Source\ZenLib\HTTP_Client\;..\..\..\Source\ZenLib\TinyXml;..\..\..\Source\ZenLib;..\..\..\Source\ZenLib\Format\Http;..\..\..\Source\ZenLib\Format\Html;..\..\..\Source\ZenLib\HTTP_Client;$(IncludePath)</IncludePath>
 			<BRCC_Defines>_RTLDLL;NO_STRICT;_UNICODE;_WIN32;$(BRCC_Defines)</BRCC_Defines>
 			<PackageImports>vcl.bpi;rtl.bpi;vclx.bpi;xmlrtl.bpi;vclie.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;dbrtl.bpi;dsnap.bpi;bcbie.bpi;vcldb.bpi;websnap.bpi;webdsnap.bpi;vclactnband.bpi</PackageImports>
 			<DCC_ResourcePath>..\..\..\Source\ZenLib\Format\Http;..\..\..\Source\ZenLib\Format\Html;..\..\..\Source\ZenLib\HTTP_Client;..\..\..\Source\ZenLib;E:\Programmation\ZenLib\Project\BCB\Library;$(DCC_ResourcePath)</DCC_ResourcePath>
@@ -70,130 +70,121 @@
 			<ILINK_LibraryPath>$(BDS)\lib\release;$(ILINK_LibraryPath);$(ILINK_LibraryPath)</ILINK_LibraryPath>
 		</PropertyGroup>
 		<ItemGroup>
-			<CppCompile Include="..\..\..\Source\ZenLib\File.cpp">
-				<BuildOrder>22</BuildOrder>
-				<BuildOrder>11</BuildOrder>
+			<CppCompile Include="..\..\..\Source\ZenLib\Ztring.cpp">
+				<BuildOrder>19</BuildOrder>
+				<BuildOrder>0</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\HTTP_Client\HTTPClientString.c">
+			<CppCompile Include="..\..\..\Source\ZenLib\ZtringList.cpp">
+				<BuildOrder>20</BuildOrder>
+				<BuildOrder>1</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\ZenLib\ZtringListList.cpp">
 				<BuildOrder>21</BuildOrder>
 				<BuildOrder>2</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\HTTP_Client.cpp">
-				<BuildOrder>24</BuildOrder>
-				<BuildOrder>13</BuildOrder>
-			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\FileName.cpp">
-				<BuildOrder>23</BuildOrder>
-				<BuildOrder>12</BuildOrder>
-			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\HTTP_Client\HTTPClientAuth.c">
+			<CppCompile Include="..\..\..\Source\ZenLib\Utils.cpp">
 				<BuildOrder>3</BuildOrder>
 				<BuildOrder>18</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\Dir.cpp">
-				<BuildOrder>6</BuildOrder>
-				<BuildOrder>17</BuildOrder>
-			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\HTTP_Client\HTTPClientWrapper.c">
-				<BuildOrder>-1</BuildOrder>
-				<BuildOrder>1</BuildOrder>
-			</CppCompile>
-			<CppCompile Include="ZenLib.cpp">
-				<BuildOrder>-1</BuildOrder>
-				<BuildOrder>0</BuildOrder>
-			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\TinyXml\tinyxml.cpp">
-				<BuildOrder>30</BuildOrder>
+			<CppCompile Include="..\..\..\Source\ZenLib\OS_Utils.cpp">
+				<BuildOrder>4</BuildOrder>
+				<BuildOrder>15</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\TinyXml\tinyxmlparser.cpp">
-				<BuildOrder>32</BuildOrder>
+			<CppCompile Include="..\..\..\Source\ZenLib\Thread.cpp">
+				<BuildOrder>5</BuildOrder>
+				<BuildOrder>16</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\TinyXml\tinyxmlerror.cpp">
-				<BuildOrder>31</BuildOrder>
+			<CppCompile Include="..\..\..\Source\ZenLib\Translation.cpp">
+				<BuildOrder>6</BuildOrder>
+				<BuildOrder>17</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\CriticalSection.cpp">
+			<CppCompile Include="..\..\..\Source\ZenLib\Format\Http\Http_Handler.cpp">
 				<BuildOrder>7</BuildOrder>
 				<BuildOrder>26</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\int128u.cpp">
-				<BuildOrder>25</BuildOrder>
-				<BuildOrder>10</BuildOrder>
+			<CppCompile Include="..\..\..\Source\ZenLib\Format\Http\Http_Request.cpp">
+				<BuildOrder>8</BuildOrder>
+				<BuildOrder>27</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\int128s.cpp">
+			<CppCompile Include="..\..\..\Source\ZenLib\Format\Http\Http_Utils.cpp">
 				<BuildOrder>9</BuildOrder>
 				<BuildOrder>28</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\InfoMap.cpp">
-				<BuildOrder>8</BuildOrder>
-				<BuildOrder>27</BuildOrder>
+			<CppCompile Include="..\..\..\Source\ZenLib\Format\Http\Http_Cookies.cpp">
+				<BuildOrder>25</BuildOrder>
+				<BuildOrder>10</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\Conf.cpp">
-				<BuildOrder>5</BuildOrder>
-				<BuildOrder>16</BuildOrder>
+			<CppCompile Include="..\..\..\Source\ZenLib\ZtringListListF.cpp">
+				<BuildOrder>22</BuildOrder>
+				<DependentOn>..\..\..\Source\ZenLib\ZtringListListF.h</DependentOn>
+				<BuildOrder>11</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\Thread.cpp">
-				<BuildOrder>5</BuildOrder>
-				<BuildOrder>16</BuildOrder>
+			<CppCompile Include="..\..\..\Source\ZenLib\Format\Html\Html_Handler.cpp">
+				<BuildOrder>23</BuildOrder>
+				<BuildOrder>12</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\OS_Utils.cpp">
+			<CppCompile Include="..\..\..\Source\ZenLib\Format\Html\Html_Request.cpp">
+				<BuildOrder>24</BuildOrder>
+				<BuildOrder>13</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\ZenLib\MemoryDebug.cpp">
+				<BuildOrder>14</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\ZenLib\HTTP_Client\HTTPClient.c">
 				<BuildOrder>4</BuildOrder>
 				<BuildOrder>15</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\Format\Http\Http_Handler.cpp">
-				<BuildOrder>7</BuildOrder>
-				<BuildOrder>26</BuildOrder>
-			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\Translation.cpp">
+			<CppCompile Include="..\..\..\Source\ZenLib\Dir.cpp">
 				<BuildOrder>6</BuildOrder>
 				<BuildOrder>17</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\ZtringList.cpp">
-				<BuildOrder>20</BuildOrder>
-				<BuildOrder>1</BuildOrder>
+			<CppCompile Include="..\..\..\Source\ZenLib\HTTP_Client\HTTPClientAuth.c">
+				<BuildOrder>3</BuildOrder>
+				<BuildOrder>18</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\Ztring.cpp">
-				<BuildOrder>19</BuildOrder>
+			<CppCompile Include="ZenLib.cpp">
+				<BuildOrder>-1</BuildOrder>
 				<BuildOrder>0</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\Utils.cpp">
-				<BuildOrder>3</BuildOrder>
-				<BuildOrder>18</BuildOrder>
+			<CppCompile Include="..\..\..\Source\ZenLib\HTTP_Client\HTTPClientWrapper.c">
+				<BuildOrder>-1</BuildOrder>
+				<BuildOrder>1</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\ZtringListList.cpp">
+			<CppCompile Include="..\..\..\Source\ZenLib\HTTP_Client\HTTPClientString.c">
 				<BuildOrder>21</BuildOrder>
 				<BuildOrder>2</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\Format\Html\Html_Request.cpp">
-				<BuildOrder>24</BuildOrder>
-				<BuildOrder>13</BuildOrder>
+			<CppCompile Include="..\..\..\Source\ZenLib\File.cpp">
+				<BuildOrder>22</BuildOrder>
+				<BuildOrder>11</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\Format\Html\Html_Handler.cpp">
+			<CppCompile Include="..\..\..\Source\ZenLib\FileName.cpp">
 				<BuildOrder>23</BuildOrder>
 				<BuildOrder>12</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\HTTP_Client\HTTPClient.c">
-				<BuildOrder>4</BuildOrder>
-				<BuildOrder>15</BuildOrder>
-			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\MemoryDebug.cpp">
-				<BuildOrder>14</BuildOrder>
+			<CppCompile Include="..\..\..\Source\ZenLib\HTTP_Client.cpp">
+				<BuildOrder>24</BuildOrder>
+				<BuildOrder>13</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\Format\Http\Http_Utils.cpp">
+			<CppCompile Include="..\..\..\Source\ZenLib\int128s.cpp">
 				<BuildOrder>9</BuildOrder>
 				<BuildOrder>28</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\Format\Http\Http_Request.cpp">
+			<CppCompile Include="..\..\..\Source\ZenLib\int128u.cpp">
+				<BuildOrder>25</BuildOrder>
+				<BuildOrder>10</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\ZenLib\Conf.cpp">
+				<BuildOrder>5</BuildOrder>
+				<BuildOrder>16</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\ZenLib\InfoMap.cpp">
 				<BuildOrder>8</BuildOrder>
 				<BuildOrder>27</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\ZtringListListF.cpp">
-				<BuildOrder>22</BuildOrder>
-				<DependentOn>..\..\..\Source\ZenLib\ZtringListListF.h</DependentOn>
-				<BuildOrder>11</BuildOrder>
-			</CppCompile>
-			<CppCompile Include="..\..\..\Source\ZenLib\Format\Http\Http_Cookies.cpp">
-				<BuildOrder>25</BuildOrder>
-				<BuildOrder>10</BuildOrder>
+			<CppCompile Include="..\..\..\Source\ZenLib\CriticalSection.cpp">
+				<BuildOrder>7</BuildOrder>
+				<BuildOrder>26</BuildOrder>
 			</CppCompile>
 			<BuildConfiguration Include="Base">
 				<Key>Base</Key>

libzen_0.4.22.tar.bz2/Project/CMake/CMakeLists.txt -> libzen_0.4.28.tar.bz2/Project/CMake/CMakeLists.txt Changed

libzen_0.4.22.tar.bz2/Project/GNU/Library/Makefile.am -> libzen_0.4.28.tar.bz2/Project/GNU/Library/Makefile.am Changed

@@ -24,11 +24,59 @@
                        ../../../Source/ZenLib/Format/Http/Http_Cookies.cpp \
                        ../../../Source/ZenLib/Format/Http/Http_Handler.cpp \
                        ../../../Source/ZenLib/Format/Http/Http_Request.cpp \
-                       ../../../Source/ZenLib/Format/Http/Http_Utils.cpp \
-                       ../../../Source/ZenLib/TinyXml/tinyxml.cpp \
-                       ../../../Source/ZenLib/TinyXml/tinyxmlerror.cpp \
-                       ../../../Source/ZenLib/TinyXml/tinyxmlparser.cpp
+                       ../../../Source/ZenLib/Format/Http/Http_Utils.cpp
 
 libzen_la_LDFLAGS     = -no-undefined -version-info 0:0:0
 
-INCLUDES = -I../../../Source
+zenincludedir = $(includedir)/ZenLib
+zeninclude_HEADERS = \
+ ../../../Source/ZenLib/BitStream.h \
+ ../../../Source/ZenLib/BitStream_LE.h \
+ ../../../Source/ZenLib/Conf.h \
+ ../../../Source/ZenLib/Conf_Internal.h \
+ ../../../Source/ZenLib/CriticalSection.h \
+ ../../../Source/ZenLib/Dir.h \
+ ../../../Source/ZenLib/File.h \
+ ../../../Source/ZenLib/FileName.h \
+ ../../../Source/ZenLib/HTTP_Client.h \
+ ../../../Source/ZenLib/InfoMap.h \
+ ../../../Source/ZenLib/int128s.h \
+ ../../../Source/ZenLib/int128u.h \
+ ../../../Source/ZenLib/MemoryDebug.h \
+ ../../../Source/ZenLib/OS_Utils.h \
+ ../../../Source/ZenLib/PreComp.h \
+ ../../../Source/ZenLib/Thread.h \
+ ../../../Source/ZenLib/Trace.h \
+ ../../../Source/ZenLib/Translation.h \
+ ../../../Source/ZenLib/Utils.h \
+ ../../../Source/ZenLib/Ztring.h \
+ ../../../Source/ZenLib/ZtringList.h \
+ ../../../Source/ZenLib/ZtringListListF.h \
+ ../../../Source/ZenLib/ZtringListList.h
+
+zen_httpclientdir = $(zenincludedir)/HTTP_Client
+zen_httpclient_HEADERS = \
+ ../../../Source/ZenLib/HTTP_Client/HTTPClient.h \
+ ../../../Source/ZenLib/HTTP_Client/HTTPClientCommon.h \
+ ../../../Source/ZenLib/HTTP_Client/HTTPClientString.h \
+ ../../../Source/ZenLib/HTTP_Client/HTTPClientAuth.h \
+ ../../../Source/ZenLib/HTTP_Client/HTTPClientWrapper.h
+
+zen_format_htmldir = $(zenincludedir)/Format/Html
+zen_format_html_HEADERS = \
+ ../../../Source/ZenLib/Format/Html/Html_Handler.h \
+ ../../../Source/ZenLib/Format/Html/Html_Request.h
+
+zen_format_httpdir = $(zenincludedir)/Format/Http
+zen_format_http_HEADERS = \
+ ../../../Source/ZenLib/Format/Http/Http_Utils.h \
+ ../../../Source/ZenLib/Format/Http/Http_Request.h \
+ ../../../Source/ZenLib/Format/Http/Http_Handler.h \
+ ../../../Source/ZenLib/Format/Http/Http_Cookies.h
+
+bin_SCRIPTS = libzen-config
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libzen.pc
+
+AM_CPPFLAGS = -I../../../Source

libzen_0.4.22.tar.bz2/Project/GNU/Library/configure.ac -> libzen_0.4.28.tar.bz2/Project/GNU/Library/configure.ac Changed

@@ -3,62 +3,57 @@
 dnl #########################################################################
 
 dnl -------------------------------------------------------------------------
+dnl Name and version
+dnl
+AC_INIT(libzen, 0.4.25)
+dnl -------------------------------------------------------------------------
 dnl Test if we are at the good place
 dnl
-AC_INIT(../../../Source/ZenLib/Ztring.cpp)
+AC_CONFIG_SRCDIR(../../../Source/ZenLib/Ztring.cpp)
 
 dnl -------------------------------------------------------------------------
 dnl sets build, host, target variables and the same with _alias
 dnl
 AC_CANONICAL_BUILD
-
-dnl -------------------------------------------------------------------------
-dnl Name and version
-dnl
-AM_INIT_AUTOMAKE(ZenLib,0)
+AM_INIT_AUTOMAKE(foreign -Wall)
 
 dnl -------------------------------------------------------------------------
 dnl Autotools init
 dnl
-CFLAGS="$CFLAGS"
-CXXFLAGS="$CXXFLAGS"
 AC_PROG_CC
 AC_PROG_CXX
+AC_PROG_CPP
 AC_DISABLE_SHARED
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 
 dnl #########################################################################
-dnl Configure
-dnl #########################################################################
-
-Home=`pwd`
-
-dnl #########################################################################
 dnl ### Options
 dnl #########################################################################
 
 dnl -------------------------------------------------------------------------
 dnl Enable
 dnl
-AC_ARG_ENABLE(debug, AC_HELP_STRING(--enable-debug, Enable full debug), , enable_debug=no)
-AC_ARG_ENABLE(gprof, AC_HELP_STRING(--enable-gprof, Enable gprof log), , enable_gprof=no)
-AC_ARG_ENABLE(universal_binary, AC_HELP_STRING(--enable-universal_binary, Create Mac PPC/i386 Universal binary), , enable_universal_binary=no)
-AC_ARG_ENABLE(arch-ppc, AC_HELP_STRING(--enable-arch-ppc, Create Mac PPC architecture), , enable_arch_ppc=no)
-AC_ARG_ENABLE(arch-ppc64, AC_HELP_STRING(--enable-arch-ppc64, Create Mac PPC64 architecture), , enable_arch_ppc64=no)
-AC_ARG_ENABLE(arch-i386, AC_HELP_STRING(--enable-arch-i386, Create Mac i386 architecture), , enable_arch_i386=no)
-AC_ARG_ENABLE(arch-x86_64, AC_HELP_STRING(--enable-arch-x86_64, Create Mac x86_64 architecture), , enable_arch_x86_64=no)
-AC_ARG_ENABLE(unicode, AC_HELP_STRING(--disable-unicode, Disable unicode), , enable_unicode=yes)
-AC_ARG_ENABLE(wstringmissing, AC_HELP_STRING(--enable-wstringmissing, Disable wstring support (old compilers)), , enable_wstringmissing=no)
-AC_ARG_ENABLE(large_files, AC_HELP_STRING(--disable-large-files, Disable large files support), , enable_large_files=yes)
-dnl AC_ARG_ENABLE(threads, AC_HELP_STRING(--disable-threads, Disable threads support), , enable_threads=yes)
+AC_ARG_ENABLE(debug, AS_HELP_STRING(--enable-debug, Enable full debug), , enable_debug=no)
+AC_ARG_ENABLE(gprof, AS_HELP_STRING(--enable-gprof, Enable gprof log), , enable_gprof=no)
+AC_ARG_ENABLE(universal_binary, AS_HELP_STRING(--enable-universal_binary, Create Mac PPC/i386 Universal binary), , enable_universal_binary=no)
+AC_ARG_ENABLE(arch-ppc, AS_HELP_STRING((--enable-arch-ppc, Create Mac PPC architecture)), , enable_arch_ppc=no)
+AC_ARG_ENABLE(arch-ppc64, AS_HELP_STRING((--enable-arch-ppc64, Create Mac PPC64 architecture)), , enable_arch_ppc64=no)
+AC_ARG_ENABLE(arch-i386, AS_HELP_STRING((--enable-arch-i386, Create Mac i386 architecture)), , enable_arch_i386=no)
+AC_ARG_ENABLE(arch-x86_64, AS_HELP_STRING((--enable-arch-x86_64, Create Mac x86_64 architecture)), , enable_arch_x86_64=no)
+AC_ARG_ENABLE(unicode, AS_HELP_STRING((--disable-unicode, Disable unicode)), , enable_unicode=yes)
+AC_ARG_ENABLE(wstring_missing, AS_HELP_STRING((--enable-wstring_missing, Disable wstring support (old compilers))), , enable_wstring_missing=no)
+AC_ARG_ENABLE(stream_missing, AS_HELP_STRING((--enable-stream_missing, Disable stream support (old compilers))), , enable_stream_missing=no)
+AC_ARG_ENABLE(large_files, AS_HELP_STRING((--disable-large_files, Disable large files support)), , enable_large_files=yes)
+dnl AC_ARG_ENABLE(threads, AS_HELP_STRING((--disable-threads, Disable threads support)), , enable_threads=yes)
+ 
 
 dnl -------------------------------------------------------------------------
 dnl With
 dnl
-AC_ARG_WITH(macosx-sdk, AC_HELP_STRING(--with-macosx-sdk, Force the Mac SDK), , with_macosx_sdk=no)
-AC_ARG_WITH(macosx-version-min, AC_HELP_STRING(--with-macosx-version-min, Force the Mac Version), , with_macosx_version_min=no)
+AC_ARG_WITH(macosx-sdk, AS_HELP_STRING((--with-macosx-sdk, Force the Mac SDK)), , with_macosx_sdk=no)
+AC_ARG_WITH(macosx-version-min, AS_HELP_STRING((--with-macosx-version-min, Force the Mac Version)), , with_macosx_version_min=no)
 
 dnl #########################################################################
 dnl ### Compiler specific
@@ -127,8 +122,8 @@
 dnl -------------------------------------------------------------------------
 dnl Common
 dnl
-ZenLib_LIBS="-L$(pwd) -lzen -lpthread $ZenLib_LIBS"
-ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lpthread $ZenLib_LIBS_Static"
+ZenLib_LIBS="-L$(pwd) -lzen -lpthread -lstdc++ $ZenLib_LIBS"
+ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lpthread -lstdc++ $ZenLib_LIBS_Static"
 
 dnl #########################################################################
 dnl ### C/C++ compiler options used to compile
@@ -137,13 +132,13 @@
 dnl -------------------------------------------------------------------------
 dnl wstring
 dnl
-if test "$enable_wstringmissing" = "yes"; then
+if test "$enable_wstring_missing" = "yes"; then
 	CXXFLAGS="$CXXFLAGS -DWSTRING_MISSING"
 	ZenLib_CXXFLAGS="$ZenLib_CXXFLAGS -DWSTRING_MISSING"
-	ZenLib_WstringMissing="yes"
+	ZenLib_wstring_missing="yes"
 	enable_unicode="no"
 else
-	ZenLib_WstringMissing="no"
+	ZenLib_wstring_missing="no"
 fi
 
 dnl -------------------------------------------------------------------------
@@ -172,6 +167,39 @@
 dnl
 
 dnl -------------------------------------------------------------------------
+dnl Check if size_t is long
+dnl
+AC_LANG(C++)
+AC_COMPILE_IFELSE(
+	#include <cstdlib>
+	void foo(signed int) {}
+	void foo(unsigned int) {}
+	int main () {foo(size_t(0)); return 0;}, size_t_is_long="no", size_t_is_long="yes")
+
+if test "$size_t_is_long" = "yes"; then
+	CXXFLAGS="$CXXFLAGS -DSIZE_T_IS_LONG"
+	ZenLib_CXXFLAGS="$ZenLib_CXXFLAGS -DSIZE_T_IS_LONG"
+fi
+
+dnl -------------------------------------------------------------------------
+dnl Check if stream is available
+dnl
+AC_LANG(C++)
+if test "$enable_unicode" = "yes"; then
+ AC_COMPILE_IFELSE(
+ #include <sstream>
+ int main () {std::wstringstream message; message<<1.0; return 0;}, , enable_stream_missing="yes")
+else
+ AC_COMPILE_IFELSE(
+ #include <sstream>
+ int main () {std::stringstream message; message<<1.0; return 0;}, , enable_stream_missing="yes")
+fi
+
+if test "$enable_stream_missing" = "yes"; then
+	CXXFLAGS="$CXXFLAGS -DSTREAM_MISSING"
+fi
+
+dnl -------------------------------------------------------------------------
 dnl GNU compiler
 dnl
 if test "$GXX" = yes ; then
@@ -193,7 +221,7 @@
 dnl -------------------------------------------------------------------------
 dnl External libs
 dnl
-LDFLAGS="$LDFLAGS -lpthread"
+LDFLAGS="$LDFLAGS -lpthread -lstdc++"
 
 dnl #########################################################################
 dnl ### Output
@@ -203,7 +231,7 @@
 AC_SUBST(ZenLib_LIBS)
 AC_SUBST(ZenLib_LIBS_Static)
 AC_SUBST(ZenLib_Unicode)
-AC_SUBST(ZenLib_WstringMissing)
+AC_SUBST(ZenLib_wstring_missing)
 AC_SUBST(ZenLib_LargeFiles)
 AC_CONFIG_FILES(libzen-config, chmod u+x libzen-config)
 AC_CONFIG_FILES(libzen.pc)
@@ -218,8 +246,9 @@
 echo "Configured ZenLib for '$build'"
 echo ""
 echo " Unicode? $enable_unicode"
-echo " wstring missing support? $ZenLib_WstringMissing"
 echo " Large files support? $enable_large_files"
+echo " wstring missing support? $enable_wstring_missing"
+echo " stream missing support? $enable_stream_missing"
 echo ""
 echo " Create static lib? $enable_static"
 echo " Create shared lib? $enable_shared"

libzen_0.4.22.tar.bz2/Project/GNU/Library/libzen-config.in -> libzen_0.4.28.tar.bz2/Project/GNU/Library/libzen-config.in Changed

libzen_0.4.22.tar.bz2/Project/GNU/Library/libzen.pc.in -> libzen_0.4.28.tar.bz2/Project/GNU/Library/libzen.pc.in Changed

libzen_0.4.22.tar.bz2/Project/GNU/libzen.dsc -> libzen_0.4.28.tar.bz2/Project/GNU/libzen.dsc Changed

libzen_0.4.22.tar.bz2/Project/GNU/libzen.spec -> libzen_0.4.28.tar.bz2/Project/GNU/libzen.spec Changed

@@ -6,32 +6,59 @@
 
 # norootforbuild
 
-%define libzen_version			0.4.22
+%define libzen_version			0.4.28
 
-Name:			libzen0
+Name:			libzen
 Version:		%libzen_version
 Release:		1
-Summary:		Shared library for libmediainfo and medianfo*
+Summary:		ZenLib C++ utility library
 Group:			System/Libraries
-License:		BSD
-URL:			http://zenlib.sourceforge.net/
-Packager:		MediaArea.net <info@mediaarea.net>
+License:		zlib
+URL:			http://sourceforge.net/projects/zenlib
+Packager:		MediaArea.net SARL <info@mediaarea.net>
 Source:			libzen_%{version}-1.tar.gz
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires:	pkgconfig
 BuildRequires:	dos2unix
 BuildRequires:	doxygen
 BuildRequires:	gcc-c++
+BuildRequires:	glibc-devel
 
 %description
-Shared library for libmediainfo and medianfo-*.
+ZenLib is a C++ utility library. It includes classes for handling strings,
+configuration, bit streams, threading, translation, and cross-platform
+operating system functions.
 
-%package -n libzen0-devel
-Summary:	Include files and mandatory libraries for development
+This package contains the headers required for compiling applications/libraries
+which use this library.
+
+%package -n libzen0
+Summary:		ZenLib C++ utility library -- shared library
+Group:			System/Libraries
+Requires:		glibc
+
+%description -n libzen0
+ZenLib is a C++ utility library. It includes classes for handling strings,
+configuration, bit streams, threading, translation, and cross-platform
+operating system functions.
+
+This package contains the headers required for compiling applications/libraries
+which use this library.
+
+%package -n libzen-devel
+Summary:	ZenLib C++ utility library -- development files
 Group:		Development/Libraries/C and C++
-Requires:	libzen0 = %{version}
+Requires:	libzen0%{?_isa} = %{version}
+Requires:	glibc-devel
+Obsoletes:	libzen0-devel
+
+%description -n libzen-devel
+ZenLib is a C++ utility library. It includes classes for handling strings,
+configuration, bit streams, threading, translation, and cross-platform
+operating system functions.
 
-%description -n libzen0-devel
-Include files and mandatory libraries for development.
+This package contains the headers and other development support files needed
+for compiling and linking applications and libraries which use this library.
 
 %prep
 %setup -q -n ZenLib
@@ -51,7 +78,7 @@
 pushd Project/GNU/Library
 	%__chmod +x autogen
 	./autogen
-	%configure --enable-shared
+	%configure --disable-static --enable-shared
 
 	%__make clean
 	%__make %{?jobs:-j%{jobs}}
@@ -66,7 +93,7 @@
 %__install -dm 755 %{buildroot}%{_includedir}/ZenLib
 %__install -m 644 Source/ZenLib/*.h \
 	%{buildroot}%{_includedir}/ZenLib
-for i in Base64 HTTP_Client Format/Html Format/Http TinyXml; do
+for i in HTTP_Client Format/Html Format/Http; do
 	%__install -dm 755 %{buildroot}%{_includedir}/ZenLib/$i
 	%__install -m 644 Source/ZenLib/$i/*.h \
 		%{buildroot}%{_includedir}/ZenLib/$i
@@ -85,23 +112,23 @@
 
 %postun -n libzen0 -p /sbin/ldconfig
 
-%files
+%files -n libzen0
 %defattr(-,root,root,-)
 %doc History.txt License.txt ReadMe.txt
 %{_libdir}/libzen.so.*
 
-%files -n libzen0-devel
+%files -n libzen-devel
 %defattr(-,root,root,-)
 %doc Documentation.html
 %doc Doc/*
+%{_bindir}/libzen-config
 %dir %{_includedir}/ZenLib
 %{_includedir}/ZenLib/*
-%{_libdir}/libzen.a
 %{_libdir}/libzen.la
 %{_libdir}/libzen.so
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Tue Jan 01 2009 MediaArea.net <info@mediaarea.net> - 0.4.22-0
+* Tue Jan 01 2009 MediaArea.net SARL <info@mediaarea.net> - 0.4.28-0
 - See History.txt for more info and real dates
 - Previous packages made by Toni Graffy <toni@links2linux.de>

libzen_0.4.22.tar.bz2/Project/MSVC2005/Library/ZenLib.vcproj -> libzen_0.4.28.tar.bz2/Project/MSVC2005/Library/ZenLib.vcproj Changed

@@ -204,46 +204,6 @@
 					</File>
 				</Filter>
 			</Filter>
-			<Filter
-				Name="TinyXml"
-				>
-				<File
-					RelativePath="..\..\..\Source\ZenLib\TinyXml\tinyxml.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\..\Source\ZenLib\TinyXml\tinyxmlerror.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\..\Source\ZenLib\TinyXml\tinyxmlparser.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -370,14 +330,6 @@
 					</File>
 				</Filter>
 			</Filter>
-			<Filter
-				Name="TinyXml"
-				>
-				<File
-					RelativePath="..\..\..\Source\ZenLib\TinyXml\tinyxml.h"
-					>
-				</File>
-			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"

libzen_0.4.22.tar.bz2/Project/MSVC2008/Library/ZenLib.vcproj -> libzen_0.4.28.tar.bz2/Project/MSVC2008/Library/ZenLib.vcproj Changed

@@ -849,214 +849,6 @@
 					</File>
 				</Filter>
 			</Filter>
-			<Filter
-				Name="TinyXml"
-				>
-				<File
-					RelativePath="..\..\..\Source\ZenLib\TinyXml\tinyxml.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseA|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseA|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugA|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugA|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\..\Source\ZenLib\TinyXml\tinyxmlerror.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseA|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseA|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugA|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugA|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\..\Source\ZenLib\TinyXml\tinyxmlparser.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseA|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseA|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugA|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugA|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -1183,14 +975,6 @@
 					</File>
 				</Filter>
 			</Filter>
-			<Filter
-				Name="TinyXml"
-				>
-				<File
-					RelativePath="..\..\..\Source\ZenLib\TinyXml\tinyxml.h"
-					>
-				</File>
-			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"

libzen_0.4.22.tar.bz2/Project/MSVC2010/Library/ZenLib.vcxproj -> libzen_0.4.28.tar.bz2/Project/MSVC2010/Library/ZenLib.vcxproj Changed

@@ -141,13 +141,10 @@
 </Lib>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
 <ClCompile>
 <Optimization>Disabled</Optimization>
 <AdditionalIncludeDirectories>../../../Source;../../../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;WSTRING_MISSING;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
 <WarningLevel>Level4</WarningLevel>
 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -176,9 +173,6 @@
 </Lib>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
 <ClCompile>
 <Optimization>MaxSpeed</Optimization>
 <AdditionalIncludeDirectories>../../../Source;../../../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -209,9 +203,6 @@
 </Lib>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
 <ClCompile>
 <Optimization>MaxSpeed</Optimization>
 <AdditionalIncludeDirectories>../../../Source;../../../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -244,9 +235,6 @@
 </Lib>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
 <ClCompile>
 <Optimization>Disabled</Optimization>
 <AdditionalIncludeDirectories>../../../Source;../../../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -286,36 +274,6 @@
 <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
 </ClCompile>
 <ClCompile Include="..\..\..\Source\ZenLib\Thread.cpp" />
- <ClCompile Include="..\..\..\Source\ZenLib\TinyXml\tinyxml.cpp">
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\TinyXml\tinyxmlerror.cpp">
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\TinyXml\tinyxmlparser.cpp">
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
- </ClCompile>
 <ClCompile Include="..\..\..\Source\ZenLib\Translation.cpp" />
 <ClCompile Include="..\..\..\Source\ZenLib\Utils.cpp" />
 <ClCompile Include="..\..\..\Source\ZenLib\Ztring.cpp" />
@@ -346,7 +304,6 @@
 <ClInclude Include="..\..\..\Source\ZenLib\OS_Utils.h" />
 <ClInclude Include="..\..\..\Source\ZenLib\PreComp.h" />
 <ClInclude Include="..\..\..\Source\ZenLib\Thread.h" />
- <ClInclude Include="..\..\..\Source\ZenLib\TinyXml\tinyxml.h" />
 <ClInclude Include="..\..\..\Source\ZenLib\Trace.h" />
 <ClInclude Include="..\..\..\Source\ZenLib\Translation.h" />
 <ClInclude Include="..\..\..\Source\ZenLib\Utils.h" />

libzen_0.4.22.tar.bz2/Project/MSVC2010/Library/ZenLib.vcxproj.filters -> libzen_0.4.28.tar.bz2/Project/MSVC2010/Library/ZenLib.vcxproj.filters Changed

@@ -27,16 +27,6 @@
 <Filter Include="Header Files\Format\Http">
 <UniqueIdentifier>{16c53209-3c96-4ded-b925-c5cd36c4858f}</UniqueIdentifier>
 </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
- </Filter>
- <Filter Include="Source Files\TinyXml">
- <UniqueIdentifier>{90efed23-2231-4b67-b2f4-fa75141216c2}</UniqueIdentifier>
- </Filter>
- <Filter Include="Header Files\TinyXml">
- <UniqueIdentifier>{8a783f33-ca47-41a6-8d7b-58e42dbf1a36}</UniqueIdentifier>
- </Filter>
 </ItemGroup>
 <ItemGroup>
 <ClCompile Include="..\..\..\Source\ZenLib\Conf.cpp">
@@ -111,15 +101,6 @@
 <ClCompile Include="..\..\..\Source\ZenLib\Format\Html\Html_Request.cpp">
 <Filter>Source Files\Format\Html</Filter>
 </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\TinyXml\tinyxmlparser.cpp">
- <Filter>Source Files\TinyXml</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\TinyXml\tinyxml.cpp">
- <Filter>Source Files\TinyXml</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Source\ZenLib\TinyXml\tinyxmlerror.cpp">
- <Filter>Source Files\TinyXml</Filter>
- </ClCompile>
 <ClCompile Include="..\..\..\Source\ZenLib\PreComp.cpp">
 <Filter>Source Files</Filter>
 </ClCompile>
@@ -206,9 +187,6 @@
 <ClInclude Include="..\..\..\Source\ZenLib\Format\Http\Http_Utils.h">
 <Filter>Header Files\Format\Http</Filter>
 </ClInclude>
- <ClInclude Include="..\..\..\Source\ZenLib\TinyXml\tinyxml.h">
- <Filter>Header Files\TinyXml</Filter>
- </ClInclude>
 <ClInclude Include="..\..\..\Source\ZenLib\Conf_Internal.h">
 <Filter>Header Files</Filter>
 </ClInclude>
@@ -216,4 +194,4 @@
 <Filter>Header Files</Filter>
 </ClInclude>
 </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

libzen_0.4.22.tar.bz2/Project/Solaris/mkpkg -> libzen_0.4.28.tar.bz2/Project/Solaris/mkpkg Changed

libzen_0.4.22.tar.bz2/Source/Doc/Doxyfile -> libzen_0.4.28.tar.bz2/Source/Doc/Doxyfile Changed

libzen_0.4.28.tar.bz2/Source/ZenLib/BitStream_Fast.h Added

@@ -0,0 +1,434 @@
+// ZenLib::bitStream - Read bit per bit
+// Copyright (C) 2006-2011 MediaArea.net SARL, Info@MediaArea.net
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgment in the product documentation would be
+// appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Read a stream bit per bit
+// Can read up to 32 bits at once
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef ZenBitStream_FastH
+#define ZenBitStream_FastH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "ZenLib/Conf.h"
+//---------------------------------------------------------------------------
+
+namespace ZenLib
+{
+
+#ifndef MIN
+ #define MIN(a, b) (((a) < (b)) ? (a) : (b))
+#endif
+
+class BitStream_Fast
+{
+public:
+ BitStream_Fast () {Buffer=NULL;
+ Buffer_Size=Buffer_Size_Init=0;
+ BufferUnderRun=false;}
+ BitStream_Fast (const int8u* Buffer_, size_t Size_) {Buffer=Buffer_;
+ Buffer_Size=Buffer_Size_Init=Size_*8; //Size is in bits
+ BufferUnderRun=false;}
+ ~BitStream_Fast () {};
+
+ void Attach(const int8u* Buffer_, size_t Size_)
+ {
+ Buffer=Buffer_;
+ Buffer_Size=Buffer_Size_Init=Size_*8; //Size is in bits
+ BufferUnderRun=false;
+ };
+
+ bool GetB ()
+ {
+ if (Buffer_Size%8)
+ {
+ Buffer_Size--;
+ return ((LastByte>>(Buffer_Size%8))&0x1)?true:false;
+ }
+
+ if (!Buffer_Size)
+ {
+ Buffer_Size=0;
+ BufferUnderRun=true;
+ return false;
+ }
+
+ LastByte=*Buffer;
+ Buffer++;
+ Buffer_Size--;
+ return (LastByte&0x80)?true:false;
+ }
+
+ int8u Get1 (int8u HowMany)
+ {
+ int8u ToReturn;
+ static const int8u Mask9=
+ {
+ 0x00,
+ 0x01, 0x03, 0x07, 0x0f,
+ 0x1f, 0x3f, 0x7f, 0xff,
+ };
+
+ if (HowMany<=(Buffer_Size%8))
+ {
+ Buffer_Size-=HowMany;
+ return (LastByte>>(Buffer_Size%8))&MaskHowMany;
+ }
+
+ if (HowMany>Buffer_Size)
+ {
+ Buffer_Size=0;
+ BufferUnderRun=true;
+ return 0;
+ }
+
+ int8u NewBits=HowMany-(Buffer_Size%8);
+ if (NewBits==8)
+ ToReturn=0;
+ else
+ ToReturn=LastByte<<NewBits;
+ LastByte=*Buffer;
+ Buffer++;
+ Buffer_Size-=HowMany;
+ ToReturn|=(LastByte>>(Buffer_Size%8))&MaskNewBits;
+ return ToReturn&MaskHowMany;
+ }
+
+ int16u Get2 (int8u HowMany)
+ {
+ int16u ToReturn;
+ static const int16u Mask17=
+ {
+ 0x0000,
+ 0x0001, 0x0003, 0x0007, 0x000f,
+ 0x001f, 0x003f, 0x007f, 0x00ff,
+ 0x01ff, 0x03ff, 0x07ff, 0x0fff,
+ 0x1fff, 0x3fff, 0x7fff, 0xffff,
+ };
+
+ if (HowMany<=(Buffer_Size%8))
+ {
+ Buffer_Size-=HowMany;
+ return (LastByte>>(Buffer_Size%8))&MaskHowMany;
+ }
+
+ if (HowMany>Buffer_Size)
+ {
+ Buffer_Size=0;
+ BufferUnderRun=true;
+ return 0;
+ }
+
+ int8u NewBits=HowMany-(Buffer_Size%8);
+ if (NewBits==16)
+ ToReturn=0;
+ else
+ ToReturn=LastByte<<NewBits;
+ if ((NewBits-1)>>3)
+ {
+ NewBits-=8;
+ ToReturn|=*Buffer<<NewBits;
+ Buffer++;
+ }
+ LastByte=*Buffer;
+ Buffer++;
+ Buffer_Size-=HowMany;
+ ToReturn|=(LastByte>>(Buffer_Size%8))&MaskNewBits;
+ return ToReturn&MaskHowMany;
+ }
+
+ int32u Get4 (int8u HowMany)
+ {
+ int32u ToReturn;
+ static const int32u Mask33=
+ {
+ 0x00000000,
+ 0x00000001, 0x00000003, 0x00000007, 0x0000000f,
+ 0x0000001f, 0x0000003f, 0x0000007f, 0x000000ff,
+ 0x000001ff, 0x000003ff, 0x000007ff, 0x00000fff,
+ 0x00001fff, 0x00003fff, 0x00007fff, 0x0000ffff,
+ 0x0001ffff, 0x0003ffff, 0x0007ffff, 0x000fffff,
+ 0x001fffff, 0x003fffff, 0x007fffff, 0x00ffffff,
+ 0x01ffffff, 0x03ffffff, 0x07ffffff, 0x0fffffff,
+ 0x1fffffff, 0x3fffffff, 0x7fffffff, 0xffffffff,
+ };
+
+ if (HowMany<=(Buffer_Size%8))
+ {
+ Buffer_Size-=HowMany;
+ return (LastByte>>(Buffer_Size%8))&MaskHowMany;
+ }
+
+ if (HowMany>Buffer_Size)
+ {
+ Buffer_Size=0;
+ BufferUnderRun=true;
+ return 0;
+ }
+
+ int8u NewBits=HowMany-(Buffer_Size%8);
+ if (NewBits==32)
+ ToReturn=0;
+ else
+ ToReturn=LastByte<<NewBits;
+ switch ((NewBits-1)>>3)
+ {
+ case 3 : NewBits-=8;
+ ToReturn|=*Buffer<<NewBits;
+ Buffer++;
+ case 2 : NewBits-=8;
+ ToReturn|=*Buffer<<NewBits;
+ Buffer++;
+ case 1 : NewBits-=8;
+ ToReturn|=*Buffer<<NewBits;
+ Buffer++;
+ default: ;
+ }
+ LastByte=*Buffer;
+ Buffer++;
+ Buffer_Size-=HowMany;
+ ToReturn|=(LastByte>>(Buffer_Size%8))&MaskNewBits;
+ return ToReturn&MaskHowMany;
+ }
+
+ int64u Get8 (int8u HowMany)
+ {
+ if (HowMany>64)
+ return 0; //Not supported
+ int8u HowMany1, HowMany2;
+ int64u Value1, Value2;
+ if (HowMany>32)
+ HowMany1=HowMany-32;
+ else
+ HowMany1=0;
+ HowMany2=HowMany-HowMany1;
+ Value1=Get4(HowMany1);
+ Value2=Get4(HowMany2);
+ if (BufferUnderRun)
+ return 0;
+ return Value1*0x100000000LL+Value2;
+ }
+
+ void Skip (size_t HowMany)
+ {
+ if (HowMany<=(Buffer_Size%8))
+ {
+ Buffer_Size-=HowMany;
+ return;
+ }
+
+ if (HowMany>Buffer_Size)
+ {
+ Buffer_Size=0;
+ BufferUnderRun=true;
+ return;
+ }
+
+ Buffer+=(HowMany-(Buffer_Size%8)-1)>>3;
+ LastByte=*Buffer;
+ Buffer++;
+ Buffer_Size-=HowMany;
+ };
+
+ bool PeekB()
+ {
+ if (Buffer_Size%8)
+ return ((LastByte>>((Buffer_Size-1)%8))&0x1)?true:false;
+
+ if (!Buffer_Size)
+ {
+ Buffer_Size=0;
+ BufferUnderRun=true;
+ return false;
+ }
+
+ return ((*Buffer)&0x80)?true:false;
+ }
+
+ int8u Peek1(int8u HowMany)
+ {
+ int8u ToReturn;
+ static const int8u Mask9=
+ {
+ 0x00,
+ 0x01, 0x03, 0x07, 0x0f,
+ 0x1f, 0x3f, 0x7f, 0xff,
+ };
+
+ if (HowMany<=(Buffer_Size%8))
+ return (LastByte>>((Buffer_Size-HowMany)%8))&MaskHowMany;
+
+ if (HowMany>Buffer_Size)
+ {
+ Buffer_Size=0;
+ BufferUnderRun=true;
+ return 0;
+ }
+
+ int8u NewBits=HowMany-(Buffer_Size%8);
+ if (NewBits==8)
+ ToReturn=0;
+ else
+ ToReturn=LastByte<<NewBits;
+ ToReturn|=((*Buffer)>>((Buffer_Size-HowMany)%8))&MaskNewBits;
+
+ return ToReturn&MaskHowMany;
+ }
+
+ int16u Peek2(int8u HowMany)
+ {
+ int16u ToReturn;
+ static const int16u Mask17=
+ {
+ 0x0000,
+ 0x0001, 0x0003, 0x0007, 0x000f,
+ 0x001f, 0x003f, 0x007f, 0x00ff,
+ 0x01ff, 0x03ff, 0x07ff, 0x0fff,
+ 0x1fff, 0x3fff, 0x7fff, 0xffff,
+ };
+
+ if (HowMany<=(Buffer_Size%8))
+ return (LastByte>>((Buffer_Size-HowMany)%8))&MaskHowMany;
+
+ if (HowMany>Buffer_Size)
+ {
+ Buffer_Size=0;
+ BufferUnderRun=true;
+ return 0;
+ }
+
+ const int8u* Buffer_Save=Buffer;
+
+ int8u NewBits=HowMany-(Buffer_Size%8);
+ if (NewBits==16)
+ ToReturn=0;
+ else
+ ToReturn=LastByte<<NewBits;
+ if ((NewBits-1)>>3)
+ {
+ NewBits-=8;
+ ToReturn|=*Buffer<<NewBits;
+ Buffer++;
+ }
+ ToReturn|=((*Buffer)>>((Buffer_Size-HowMany)%8))&MaskNewBits;
+
+ Buffer=Buffer_Save;
+
+ return ToReturn&MaskHowMany;
+ }
+
+ int32u Peek4(int8u HowMany)
+ {
+ int32u ToReturn;
+ static const int32u Mask33=
+ {
+ 0x00000000,
+ 0x00000001, 0x00000003, 0x00000007, 0x0000000f,
+ 0x0000001f, 0x0000003f, 0x0000007f, 0x000000ff,
+ 0x000001ff, 0x000003ff, 0x000007ff, 0x00000fff,
+ 0x00001fff, 0x00003fff, 0x00007fff, 0x0000ffff,
+ 0x0001ffff, 0x0003ffff, 0x0007ffff, 0x000fffff,
+ 0x001fffff, 0x003fffff, 0x007fffff, 0x00ffffff,
+ 0x01ffffff, 0x03ffffff, 0x07ffffff, 0x0fffffff,
+ 0x1fffffff, 0x3fffffff, 0x7fffffff, 0xffffffff,
+ };
+
+ if (HowMany<=(Buffer_Size%8))
+ return (LastByte>>((Buffer_Size-HowMany)%8))&MaskHowMany;
+
+ if (HowMany>Buffer_Size)
+ {
+ Buffer_Size=0;
+ BufferUnderRun=true;
+ return 0;
+ }
+
+ const int8u* Buffer_Save=Buffer;
+
+ int8u NewBits=HowMany-(Buffer_Size%8);
+ if (NewBits==32)
+ ToReturn=0;
+ else
+ ToReturn=LastByte<<NewBits;
+ switch ((NewBits-1)>>3)
+ {
+ case 3 : NewBits-=8;
+ ToReturn|=*Buffer<<NewBits;
+ Buffer++;
+ case 2 : NewBits-=8;
+ ToReturn|=*Buffer<<NewBits;
+ Buffer++;
+ case 1 : NewBits-=8;
+ ToReturn|=*Buffer<<NewBits;
+ Buffer++;
+ default: ;
+ }
+ ToReturn|=((*Buffer)>>((Buffer_Size-HowMany)%8))&MaskNewBits;
+
+ Buffer=Buffer_Save;
+
+ return ToReturn&MaskHowMany;
+ }
+
+ int64u Peek8(int8u HowMany)
+ {
+ return (int64u)Peek4(HowMany); //Not yet implemented
+ }
+
+ inline size_t Remain () //How many bits remain?
+ {
+ return Buffer_Size;
+ };
+
+ inline void Byte_Align()
+ {
+ Skip (Buffer_Size%8);
+ };
+
+ inline size_t Offset_Get()
+ {
+ return (Buffer_Size_Init-Buffer_Size)/8;
+ };
+
+ inline size_t BitOffset_Get()
+ {
+ return Buffer_Size%8;
+ };
+
+ inline size_t OffsetBeforeLastCall_Get() //No more valid
+ {
+ return Buffer_Size%8;
+ };
+
+private :
+ const int8u* Buffer;
+ size_t Buffer_Size;
+ size_t Buffer_Size_Init;
+ int8u LastByte;
+public :
+ bool BufferUnderRun;
+};
+
+} //namespace ZenLib
+#endif

libzen_0.4.22.tar.bz2/Source/ZenLib/BitStream_LE.h -> libzen_0.4.28.tar.bz2/Source/ZenLib/BitStream_LE.h Changed

libzen_0.4.22.tar.bz2/Source/ZenLib/Conf.cpp -> libzen_0.4.28.tar.bz2/Source/ZenLib/Conf.cpp Changed

libzen_0.4.22.tar.bz2/Source/ZenLib/Conf.h -> libzen_0.4.28.tar.bz2/Source/ZenLib/Conf.h Changed

@@ -70,6 +70,9 @@
         #define __WINDOWS__ 1
     #endif
 #endif
+#if !defined(ZENLIB_NO_WIN9X_SUPPORT) && (defined(_M_X64) || defined(_M_IA64))
+    #define ZENLIB_NO_WIN9X_SUPPORT
+#endif
 
 //---------------------------------------------------------------------------
 //Unix (Linux, HP, Sun, BeOS...)
@@ -188,8 +191,8 @@
 #endif
 //---------------------------------------------------------------------------
 //If we need size_t specific integer conversion
-#if defined(__LP64__) || defined(MACOSX)
-    #define NEED_SIZET
+#if !defined(SIZE_T_IS_LONG) && (defined(__LP64__) || defined(MACOSX))
+    #define SIZE_T_IS_LONG
 #endif
 
 //---------------------------------------------------------------------------
@@ -216,19 +219,13 @@
 
 //---------------------------------------------------------------------------
 //Char types
-#undef  _T
-#define _T(__x)     __T(__x)
-#undef  _TEXT
-#define _TEXT(__x)  __T(__x)
-#undef  __TEXT
-#define __TEXT(__x) __T(__x)
 #if defined(__UNICODE__)
     #if defined (_MSC_VER) && !defined (_NATIVE_WCHAR_T_DEFINED)
         #pragma message Native wchar_t is not defined, not tested, you should put /Zc:wchar_t in compiler options
     #endif
     typedef wchar_t Char;
     #undef  __T
-    #define __T(__x) L##__x
+    #define __T(__x) L ## __x
 #else // defined(__UNICODE__)
     typedef char Char;
     #undef  __T

libzen_0.4.22.tar.bz2/Source/ZenLib/Conf_Internal.h -> libzen_0.4.28.tar.bz2/Source/ZenLib/Conf_Internal.h Changed

@@ -32,65 +32,10 @@
 //***************************************************************************
 
 #ifndef ZENLIB_USEWX
- #ifdef WINDOWS
- #else
+ #ifndef WINDOWS
 #define ZENLIB_STANDARD //We select the C/C++ standard as much as possible
 #endif
 #endif //ZENLIB_USEWX
 
-//***************************************************************************
-// Default values
-//***************************************************************************
-
-#ifndef _LARGE_FILES
- #define _LARGE_FILES
-#endif //_LARGE_FILES
-
-//***************************************************************************
-// Includes
-//***************************************************************************
-
-//---------------------------------------------------------------------------
-//Useful for precompiled headers
-#ifdef ZENLIB_USEWX
- #ifndef __BORLANDC__ //Borland C++ does NOT support large files
- #ifndef _FILE_OFFSET_BITS
- #define _FILE_OFFSET_BITS 64
- #endif //_FILE_OFFSET_BITS
- #ifndef _LARGE_FILES
- #define _LARGE_FILES
- #endif //_LARGE_FILES
- #ifndef _LARGEFILE_SOURCE
- #define _LARGEFILE_SOURCE 1
- #endif //_LARGEFILE_SOURCE
- #endif //__BORLANDC__
- #ifdef __BORLANDC__
- #include <mem.h> //memcpy
- #endif //__BORLANDC__
- #include <wx/wxprec.h>
-#else //ZENLIB_USEWX
- #if defined(__VISUALC__) || defined(__BORLANDC__)
- #if defined WINDOWS && !defined ZENLIB_STANDARD
- #undef __TEXT
- #include <windows.h>
- #endif //WINDOWS
- #include <algorithm>
- #include <cmath>
- #include <complex>
- #include <cstdio>
- #include <cstdlib>
- #include <cstring>
- #include <ctime>
- #include <fstream>
- #include <functional>
- #include <iomanip>
- #include <map>
- #include <memory>
- #include <sstream>
- #include <stack>
- #include <string>
- #endif //defined(__VISUALC__) || defined(__BORLANDC__)
-#endif //ZENLIB_USEWX
-
 #endif

libzen_0.4.22.tar.bz2/Source/ZenLib/Dir.cpp -> libzen_0.4.28.tar.bz2/Source/ZenLib/Dir.cpp Changed

@@ -57,7 +57,6 @@
 #include "ZenLib/FileName.h"
 #include "ZenLib/ZtringList.h"
 #include "ZenLib/OS_Utils.h"
-#include <iostream>
 //---------------------------------------------------------------------------
 
 namespace ZenLib
@@ -113,14 +112,15 @@
 #ifdef WINDOWS
 //Is a dir?
 if (Exists(Dir_Name))
- Dir_Name+=_T("\\*");
+ Dir_Name+=__T("\\*");
 
 //Path
 Ztring Path=FileName::Path_Get(Dir_Name);
 if (Path.empty())
 {
 #ifdef UNICODE
- if (IsWin9X())
+ #ifndef ZENLIB_NO_WIN9X_SUPPORT
+ if (IsWin9X_Fast())
 {
 DWORD Path_Size=GetFullPathNameA(Dir_Name.To_Local().c_str(), 0, NULL, NULL);
 char* PathTemp=new charPath_Size+1;
@@ -129,6 +129,7 @@
 delete PathTemp; //PathTemp=NULL;
 }
 else
+ #endif //ZENLIB_NO_WIN9X_SUPPORT
 {
 DWORD Path_Size=GetFullPathName(Dir_Name.c_str(), 0, NULL, NULL);
 Char* PathTemp=new CharPath_Size+1;
@@ -146,12 +147,14 @@
 }
 
 #ifdef UNICODE
- WIN32_FIND_DATAA FindFileDataA;
 WIN32_FIND_DATAW FindFileDataW;
 HANDLE hFind;
- if (IsWin9X())
+ #ifndef ZENLIB_NO_WIN9X_SUPPORT
+ WIN32_FIND_DATAA FindFileDataA;
+ if (IsWin9X_Fast())
 hFind=FindFirstFileA(Dir_Name.To_Local().c_str(), &FindFileDataA);
 else
+ #endif //ZENLIB_NO_WIN9X_SUPPORT
 hFind=FindFirstFileW(Dir_Name.c_str(), &FindFileDataW);
 #else
 WIN32_FIND_DATA FindFileData;
@@ -166,28 +169,32 @@
 {
 #ifdef UNICODE
 Ztring File_Name;
- if (IsWin9X())
+ #ifndef ZENLIB_NO_WIN9X_SUPPORT
+ if (IsWin9X_Fast())
 File_Name=FindFileDataA.cFileName;
 else
+ #endif //ZENLIB_NO_WIN9X_SUPPORT
 File_Name=FindFileDataW.cFileName;
 #else
 Ztring File_Name(FindFileData.cFileName);
 #endif //UNICODE
- if (File_Name!=_T(".") && File_Name!=_T("..")) //Avoid . an ..
+ if (File_Name!=__T(".") && File_Name!=__T("..")) //Avoid . an ..
 {
- Ztring File_Name_Complete=Path+_T("\\")+File_Name;
+ Ztring File_Name_Complete=Path+__T("\\")+File_Name;
 if (Exists(File_Name_Complete))
 {
 if (Options&Parse_SubDirs)
 ToReturn+=GetAllFileNames(File_Name_Complete, Options); //A SubDir
 }
- else if ((Options&Include_Hidden) || (!File_Name.empty() && File_Name0!=_T('.')))
+ else if ((Options&Include_Hidden) || (!File_Name.empty() && File_Name0!=__T('.')))
 ToReturn.push_back(File_Name_Complete); //A file
 }
 #ifdef UNICODE
- if (IsWin9X())
+ #ifndef ZENLIB_NO_WIN9X_SUPPORT
+ if (IsWin9X_Fast())
 ReturnValue=FindNextFileA(hFind, &FindFileDataA);
 else
+ #endif //ZENLIB_NO_WIN9X_SUPPORT
 ReturnValue=FindNextFileW(hFind, &FindFileDataW);
 #else
 ReturnValue=FindNextFile(hFind, &FindFileData);
@@ -229,7 +236,7 @@
 {
 //A file
 Ztring File_Name(DirEnt->d_name);
- if (File_Name!=_T(".") && File_Name!=_T("..")) //Avoid . an ..
+ if (File_Name!=__T(".") && File_Name!=__T("..")) //Avoid . an ..
 {
 Ztring File_Name_Complete=Dir_Name+File_Name;
 if (Exists(File_Name_Complete))
@@ -237,7 +244,7 @@
 if (Options&Parse_SubDirs)
 ToReturn+=GetAllFileNames(File_Name_Complete, Options); //A SubDir
 }
- else if ((Options&Include_Hidden) || (!File_Name.empty() && File_Name0!=_T('.')))
+ else if ((Options&Include_Hidden) || (!File_Name.empty() && File_Name0!=__T('.')))
 ToReturn.push_back(File_Name_Complete); //A file
 }
 }
@@ -274,9 +281,11 @@
 #ifdef WINDOWS
 #ifdef UNICODE
 DWORD FileAttributes;
- if (IsWin9X())
+ #ifndef ZENLIB_NO_WIN9X_SUPPORT
+ if (IsWin9X_Fast())
 FileAttributes=GetFileAttributesA(File_Name.To_Local().c_str());
 else
+ #endif //ZENLIB_NO_WIN9X_SUPPORT
 FileAttributes=GetFileAttributesW(File_Name.c_str());
 #else
 DWORD FileAttributes=GetFileAttributes(File_Name.c_str());
@@ -303,9 +312,11 @@
 #else //ZENLIB_USEWX
 #ifdef WINDOWS
 #ifdef UNICODE
- if (IsWin9X())
+ #ifndef ZENLIB_NO_WIN9X_SUPPORT
+ if (IsWin9X_Fast())
 return CreateDirectoryA(File_Name.To_Local().c_str(), NULL)!=0;
 else
+ #endif //ZENLIB_NO_WIN9X_SUPPORT
 return CreateDirectoryW(File_Name.c_str(), NULL)!=0;
 #else
 return CreateDirectory(File_Name.c_str(), NULL)!=0;

libzen_0.4.22.tar.bz2/Source/ZenLib/File.cpp -> libzen_0.4.28.tar.bz2/Source/ZenLib/File.cpp Changed

@@ -1,5 +1,5 @@
 // ZenLib::File - File functions
-// Copyright (C) 2002-2011 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
 //
 // This software is provided 'as-is', without any express or implied
 // warranty. In no event will the authors be held liable for any damages
@@ -42,19 +42,10 @@
 #else
 #include <cstdio>
 #endif
- /*
- #ifdef WINDOWS
- #include <io.h>
- #else
- #include <cstdio>
- #endif
- #include <fcntl.h>
- #include <sys/stat.h>
- #ifndef O_BINARY
- #define O_BINARY 0
- #endif
- */
 #include <sys/stat.h>
+ #if !defined(WINDOWS)
+ #include <unistd.h>
+ #endif //!defined(WINDOWS)
 #include <fstream>
 using namespace std;
 #ifndef S_ISDIR
@@ -98,18 +89,18 @@
 
 File::File(Ztring File_Name, access_t Access)
 {
- if (!Open(File_Name, Access))
- #ifdef ZENLIB_USEWX
+ #ifdef ZENLIB_USEWX
+ File_Handle=NULL;
+ #else //ZENLIB_USEWX
+ #ifdef ZENLIB_STANDARD
 File_Handle=NULL;
- #else //ZENLIB_USEWX
- #ifdef ZENLIB_STANDARD
- File_Handle=NULL;
- #elif defined WINDOWS
- File_Handle=INVALID_HANDLE_VALUE;
- #endif
- #endif //ZENLIB_USEWX
+ #elif defined WINDOWS
+ File_Handle=INVALID_HANDLE_VALUE;
+ #endif
+ #endif //ZENLIB_USEWX
 Position=(int64u)-1;
 Size=(int64u)-1;
+ Open(File_Name, Access);
 }
 
 //---------------------------------------------------------------------------
@@ -125,6 +116,8 @@
 //---------------------------------------------------------------------------
 bool File::Open (const tstring &File_Name_, access_t Access)
 {
+ Close();
+
 File_Name=File_Name_;
 
 #ifdef ZENLIB_USEWX
@@ -185,44 +178,58 @@
 DWORD dwDesiredAccess, dwShareMode, dwCreationDisposition;
 switch (Access)
 {
- case Access_Read : dwDesiredAccess=IsWin9X()?GENERIC_READ:FILE_READ_DATA; dwShareMode=FILE_SHARE_READ|FILE_SHARE_WRITE; dwCreationDisposition=OPEN_EXISTING; break;
+ #ifndef ZENLIB_NO_WIN9X_SUPPORT
+ case Access_Read : dwDesiredAccess=IsWin9X_Fast()?GENERIC_READ:FILE_READ_DATA; dwShareMode=FILE_SHARE_READ|FILE_SHARE_WRITE; dwCreationDisposition=OPEN_EXISTING; break;
+ case Access_Write : dwDesiredAccess=GENERIC_WRITE; dwShareMode=0; dwCreationDisposition=OPEN_ALWAYS; break;
+ case Access_Read_Write : dwDesiredAccess=(IsWin9X_Fast()?GENERIC_READ:FILE_READ_DATA)|GENERIC_WRITE; dwShareMode=0; dwCreationDisposition=OPEN_ALWAYS; break;
+ case Access_Write_Append : dwDesiredAccess=GENERIC_WRITE; dwShareMode=0; dwCreationDisposition=OPEN_ALWAYS; break;
+ #else // ZENLIB_NO_WIN9X_SUPPORT
+ case Access_Read : dwDesiredAccess=FILE_READ_DATA; dwShareMode=FILE_SHARE_READ|FILE_SHARE_WRITE; dwCreationDisposition=OPEN_EXISTING; break;
 case Access_Write : dwDesiredAccess=GENERIC_WRITE; dwShareMode=0; dwCreationDisposition=OPEN_ALWAYS; break;
- case Access_Read_Write : dwDesiredAccess=(IsWin9X()?GENERIC_READ:FILE_READ_DATA)|GENERIC_WRITE; dwShareMode=0; dwCreationDisposition=OPEN_ALWAYS; break;
+ case Access_Read_Write : dwDesiredAccess=FILE_READ_DATA|GENERIC_WRITE; dwShareMode=0; dwCreationDisposition=OPEN_ALWAYS; break;
 case Access_Write_Append : dwDesiredAccess=GENERIC_WRITE; dwShareMode=0; dwCreationDisposition=OPEN_ALWAYS; break;
+ #endif //ZENLIB_NO_WIN9X_SUPPORT
 default : dwDesiredAccess=0; dwShareMode=0; dwCreationDisposition=0; break;
 }
 
 #ifdef UNICODE
- if (IsWin9X())
+ #ifndef ZENLIB_NO_WIN9X_SUPPORT
+ if (IsWin9X_Fast())
 File_Handle=CreateFileA(File_Name.To_Local().c_str(), dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, 0, NULL);
 else
+ #endif //ZENLIB_NO_WIN9X_SUPPORT
 File_Handle=CreateFileW(File_Name.c_str(), dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, 0, NULL);
 #else
 File_Handle=CreateFile(File_Name.c_str(), dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, 0, NULL);
 #endif //UNICODE
 if (File_Handle==INVALID_HANDLE_VALUE)
 {
- /*
 //Sometime the file is locked for few milliseconds, we try again later
- char lpMsgBuf1000;
 DWORD dw = GetLastError();
- FormatMessageA(
- FORMAT_MESSAGE_FROM_SYSTEM,
- NULL,
- dw,
- MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
- lpMsgBuf,
- 1000, NULL );
- */
- Sleep(1000);
- #ifdef UNICODE
- if (IsWin9X())
- File_Handle=CreateFileA(Ztring(File_Name).To_Local().c_str(), dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, 0, NULL);
- else
- File_Handle=CreateFileW(File_Name.c_str(), dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, 0, NULL);
- #else
- File_Handle=CreateFile(File_Name.c_str(), dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, 0, NULL);
- #endif //UNICODE
+ if (dw!=ERROR_FILE_NOT_FOUND)
+ {
+ /*
+ char lpMsgBuf1000;
+ FormatMessageA(
+ FORMAT_MESSAGE_FROM_SYSTEM,
+ NULL,
+ dw,
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ lpMsgBuf,
+ 1000, NULL );
+ */
+ Sleep(1000);
+ #ifdef UNICODE
+ #ifndef ZENLIB_NO_WIN9X_SUPPORT
+ if (IsWin9X_Fast())
+ File_Handle=CreateFileA(Ztring(File_Name).To_Local().c_str(), dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, 0, NULL);
+ else
+ #endif //ZENLIB_NO_WIN9X_SUPPORT
+ File_Handle=CreateFileW(File_Name.c_str(), dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, 0, NULL);
+ #else
+ File_Handle=CreateFile(File_Name.c_str(), dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, 0, NULL);
+ #endif //UNICODE
+ }
 }
 if (File_Handle==INVALID_HANDLE_VALUE)
 //File is not openable
@@ -238,8 +245,12 @@
 }
 
 //---------------------------------------------------------------------------
-bool File::Create (const Ztring &File_Name, bool OverWrite)
+bool File::Create (const Ztring &File_Name_, bool OverWrite)
 {
+ Close();
+
+ File_Name=File_Name_;
+
 #ifdef ZENLIB_USEWX
 File_Handle=(void*)new wxFile();
 if (((wxFile*)File_Handle)->Create(File_Name.c_str(), OverWrite)==0)
@@ -296,9 +307,11 @@
 }
 
 #ifdef UNICODE
- if (IsWin9X())
+ #ifndef ZENLIB_NO_WIN9X_SUPPORT
+ if (IsWin9X_Fast())
 File_Handle=CreateFileA(File_Name.To_Local().c_str(), dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, 0, NULL);
 else
+ #endif //ZENLIB_NO_WIN9X_SUPPORT
 File_Handle=CreateFileW(File_Name.c_str(), dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, 0, NULL);
 #else
 File_Handle=CreateFile(File_Name.c_str(), dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, 0, NULL);
@@ -308,9 +321,11 @@
 //Sometime the file is locked for few milliseconds, we try again later
 Sleep(3000);
 #ifdef UNICODE
- if (IsWin9X())
+ #ifndef ZENLIB_NO_WIN9X_SUPPORT
+ if (IsWin9X_Fast())
 File_Handle=CreateFileA(File_Name.To_Local().c_str(), dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, 0, NULL);
 else
+ #endif //ZENLIB_NO_WIN9X_SUPPORT
 File_Handle=CreateFileW(File_Name.c_str(), dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, 0, NULL);
 #else
 File_Handle=CreateFile(File_Name.c_str(), dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, 0, NULL);
@@ -334,7 +349,7 @@
 //close(File_Handle); File_Handle=-1;
 delete (fstream*)File_Handle; File_Handle=NULL;
 #elif defined WINDOWS
- CloseHandle(File_Handle); File_Handle=NULL;
+ CloseHandle(File_Handle); File_Handle=INVALID_HANDLE_VALUE;
 #endif
 #endif //ZENLIB_USEWX
 Position=(int64u)-1;
@@ -348,7 +363,15 @@
 //---------------------------------------------------------------------------
 size_t File::Read (int8u* Buffer, size_t Buffer_Size_Max)
 {
- if (File_Handle==NULL)
+ #ifdef ZENLIB_USEWX
+ if (File_Handle==NULL)
+ #else //ZENLIB_USEWX
+ #ifdef ZENLIB_STANDARD
+ if (File_Handle==NULL)
+ #elif defined WINDOWS
+ if (File_Handle==INVALID_HANDLE_VALUE)
+ #endif
+ #endif //ZENLIB_USEWX
 return 0;
 
 #ifdef ZENLIB_USEWX
@@ -388,10 +411,9 @@
 if (File_Handle==NULL)
 #else //ZENLIB_USEWX
 #ifdef ZENLIB_STANDARD
- //if (File_Handle==-1)
 if (File_Handle==NULL)
 #elif defined WINDOWS
- if (File_Handle==NULL)
+ if (File_Handle==INVALID_HANDLE_VALUE)
 #endif
 #endif //ZENLIB_USEWX
 return 0;
@@ -402,13 +424,64 @@
 #ifdef ZENLIB_STANDARD
 //return write(File_Handle, Buffer, Buffer_Size);
 ((fstream*)File_Handle)->write((char*)Buffer, Buffer_Size);
- return ((fstream*)File_Handle)->bad()?0:Buffer_Size;
+ if (((fstream*)File_Handle)->bad())
+ {
+ Position=(int64u)-1;
+ return 0;
+ }
+ else
+ {
+ if (Position!=(int64u)-1)
+ Position+=Buffer_Size;
+ return Buffer_Size;
+ }
 #elif defined WINDOWS
 DWORD Buffer_Size_Written;
 if (WriteFile(File_Handle, Buffer, (DWORD)Buffer_Size, &Buffer_Size_Written, NULL))
+ {
+ if (Position!=(int64u)-1)
+ Position+=Buffer_Size_Written;
 return Buffer_Size_Written;
+ }
 else
+ {
+ Position=(int64u)-1;
 return 0;
+ }
+ #endif
+ #endif //ZENLIB_USEWX
+}
+
+//---------------------------------------------------------------------------
+bool File::Truncate (int64u Offset)
+{
+ if (File_Handle==NULL)
+ return false;
+
+ #ifdef ZENLIB_USEWX
+ return false; Not supported
+ #else //ZENLIB_USEWX
+ #ifdef ZENLIB_STANDARD
+ #if defined(WINDOWS)
+ return false; //No supported
+ #else //defined(WINDOWS)
+ //Need to close the file, use truncate, reopen it
+ if (Offset==(int64u)-1)
+ Offset=Position_Get();
+ Ztring File_Name_Sav=File_Name;
+ Close();
+ truncate(File_Name_Sav.To_Local().c_str(), Offset);
+ if (!Open(File_Name_Sav, Access_Read_Write))
+ return false;
+ GoTo(0, FromEnd);
+ return true;
+ #endif //!defined(WINDOWS)
+ #elif defined WINDOWS
+ if(Offset!=(int64u)-1 && Offset!=Position_Get())
+ if (!GoTo(Offset))
+ return false;
+ SetEndOfFile(File_Handle);
+ return true;
 #endif
 #endif //ZENLIB_USEWX
 }
@@ -427,6 +500,17 @@
 //---------------------------------------------------------------------------
 bool File::GoTo (int64s Position_ToMove, move_t MoveMethod)
 {
+ #ifdef ZENLIB_USEWX
+ if (File_Handle==NULL)
+ #else //ZENLIB_USEWX
+ #ifdef ZENLIB_STANDARD
+ if (File_Handle==NULL)
+ #elif defined WINDOWS
+ if (File_Handle==INVALID_HANDLE_VALUE)
+ #endif
+ #endif //ZENLIB_USEWX
+ return false;
+
 Position=(int64u)-1; //Disabling memory
 #ifdef ZENLIB_USEWX
 return ((wxFile*)File_Handle)->Seek(Position, (wxSeekMode)MoveMethod)!=wxInvalidOffset; //move_t and wxSeekMode are same
@@ -472,6 +556,17 @@
 return Position;
 
 #ifdef ZENLIB_USEWX
+ if (File_Handle==NULL)
+ #else //ZENLIB_USEWX
+ #ifdef ZENLIB_STANDARD
+ if (File_Handle==NULL)
+ #elif defined WINDOWS
+ if (File_Handle==INVALID_HANDLE_VALUE)
+ #endif
+ #endif //ZENLIB_USEWX
+ return (int64u)-1;
+
+ #ifdef ZENLIB_USEWX
 return (int64u)-1;
 #else //ZENLIB_USEWX
 #ifdef ZENLIB_STANDARD
@@ -493,7 +588,15 @@
 //---------------------------------------------------------------------------
 int64u File::Size_Get()
 {
- if (File_Handle==NULL)
+ #ifdef ZENLIB_USEWX
+ if (File_Handle==NULL)
+ #else //ZENLIB_USEWX
+ #ifdef ZENLIB_STANDARD
+ if (File_Handle==NULL)
+ #elif defined WINDOWS
+ if (File_Handle==INVALID_HANDLE_VALUE)
+ #endif
+ #endif //ZENLIB_USEWX
 return 0;
 
 #ifdef ZENLIB_USEWX
@@ -506,21 +609,12 @@
 File_Size=lseek(File_Handle, 0, SEEK_END);
 lseek(File_Handle, CurrentPos, SEEK_SET);
 */
- #if defined(__UCLIBC__)
- fstream::pos_type CurrentPos;
- #else //defined(__UCLIBC__)
- streampos CurrentPos;
- #endif //defined(__UCLIBC__)
- CurrentPos=((fstream*)File_Handle)->tellg();
- #if defined(__UCLIBC__)
- if (CurrentPos!=(fstream::pos_type)-1)
- #else //defined(__UCLIBC__)
- if (CurrentPos!=(streampos)-1)
- #endif //defined(__UCLIBC__)
+ streampos CurrentPos=((fstream*)File_Handle)->tellg();
+ if (CurrentPos!=(streampos)-1)
 {
 ((fstream*)File_Handle)->seekg(0, ios_base::end);
 Size=((fstream*)File_Handle)->tellg();
- ((fstream*)File_Handle)->seekg(CurrentPos);
+ ((fstream*)File_Handle)->seekg(CurrentPos, ios_base::beg);
 }
 else
 Size=(int64u)-1;
@@ -528,7 +622,7 @@
 #elif defined WINDOWS
 DWORD High;DWORD Low=GetFileSize(File_Handle, &High);
 if (Low==INVALID_FILE_SIZE && GetLastError()!=NO_ERROR)
- return (int64u)-1; 
+ return (int64u)-1;
 Size=0x100000000ULL*High+Low;
 return Size;
 #endif
@@ -542,19 +636,18 @@
 if (File_Handle==NULL)
 #else //ZENLIB_USEWX
 #ifdef ZENLIB_STANDARD
- //if (File_Handle==-1)
 if (File_Handle==NULL)
 #elif defined WINDOWS
- if (File_Handle==NULL)
+ if (File_Handle==INVALID_HANDLE_VALUE)
 #endif
 #endif //ZENLIB_USEWX
 return Ztring();
 
 #ifdef ZENLIB_USEWX
- return Ztring(); //Not implemented
+ return __T(""); //Not implemented
 #else //ZENLIB_USEWX
 #ifdef ZENLIB_STANDARD
- return Ztring(); //Not implemented
+ return __T(""); //Not implemented
 #elif defined WINDOWS
 FILETIME TimeFT;
 if (GetFileTime(File_Handle, &TimeFT, NULL, NULL))
@@ -564,7 +657,7 @@
 return Time;
 }
 else
- return Ztring(); //There was a problem
+ return __T(""); //There was a problem
 #endif
 #endif //ZENLIB_USEWX
 }
@@ -576,19 +669,18 @@
 if (File_Handle==NULL)
 #else //ZENLIB_USEWX
 #ifdef ZENLIB_STANDARD
- //if (File_Handle==-1)
 if (File_Handle==NULL)
 #elif defined WINDOWS
- if (File_Handle==NULL)
+ if (File_Handle==INVALID_HANDLE_VALUE)
 #endif
 #endif //ZENLIB_USEWX
 return Ztring();
 
 #ifdef ZENLIB_USEWX
- return Ztring(); //Not implemented
+ return __T(""); //Not implemented
 #else //ZENLIB_USEWX
 #ifdef ZENLIB_STANDARD
- return Ztring(); //Not implemented
+ return __T(""); //Not implemented
 #elif defined WINDOWS
 FILETIME TimeFT;
 if (GetFileTime(File_Handle, &TimeFT, NULL, NULL))
@@ -605,11 +697,11 @@
 Time64-=((int64s)Info.StandardBias)*60*1000*1000*10;
 }
 Ztring Time; Time.Date_From_Milliseconds_1601(Time64/10000);
- Time.FindAndReplace(_T("UTC "), _T(""));
+ Time.FindAndReplace(__T("UTC "), __T(""));
 return Time;
 }
 else
- return Ztring(); //There was a problem
+ return __T(""); //There was a problem
 #endif
 #endif //ZENLIB_USEWX
 }
@@ -623,19 +715,19 @@
 #ifdef ZENLIB_STANDARD
 if (File_Handle==NULL)
 #elif defined WINDOWS
- if (File_Handle==NULL)
+ if (File_Handle==INVALID_HANDLE_VALUE)
 #endif
 #endif //ZENLIB_USEWX
 return Ztring();
 
 #ifdef ZENLIB_USEWX
- return Ztring(); //Not implemented
+ return __T(""); //Not implemented
 #else //ZENLIB_USEWX
 #ifdef ZENLIB_STANDARD
 struct stat Stat;
 int Result=stat(File_Name.To_Local().c_str(), &Stat);
 if (Result<0)
- return Ztring(); //Error
+ return __T(""); //Error
 Ztring Time; Time.Date_From_Seconds_1970(Stat.st_mtime);
 return Time;
 #elif defined WINDOWS
@@ -647,7 +739,7 @@
 return Time;
 }
 else
- return Ztring(); //There was a problem
+ return __T(""); //There was a problem
 #endif
 #endif //ZENLIB_USEWX
 }
@@ -659,22 +751,21 @@
 if (File_Handle==NULL)
 #else //ZENLIB_USEWX
 #ifdef ZENLIB_STANDARD
- //if (File_Handle==-1)
 if (File_Handle==NULL)
 #elif defined WINDOWS
- if (File_Handle==NULL)
+ if (File_Handle==INVALID_HANDLE_VALUE)
 #endif
 #endif //ZENLIB_USEWX
 return Ztring();
 
 #ifdef ZENLIB_USEWX
- return Ztring(); //Not implemented
+ return __T(""); //Not implemented
 #else //ZENLIB_USEWX
 #ifdef ZENLIB_STANDARD
 struct stat Stat;
 int Result=stat(File_Name.To_Local().c_str(), &Stat);
 if (Result<0)
- return Ztring(); //Error
+ return __T(""); //Error
 Ztring Time; Time.Date_From_Seconds_1970_Local(Stat.st_mtime);
 return Time;
 #elif defined WINDOWS
@@ -693,11 +784,11 @@
 Time64-=((int64s)Info.StandardBias)*60*1000*1000*10;
 }
 Ztring Time; Time.Date_From_Milliseconds_1601(Time64/10000);
- Time.FindAndReplace(_T("UTC "), _T(""));
+ Time.FindAndReplace(__T("UTC "), __T(""));
 return Time;
 }
 else
- return Ztring(); //There was a problem
+ return __T(""); //There was a problem
 #endif
 #endif //ZENLIB_USEWX
 }
@@ -724,15 +815,6 @@
 //---------------------------------------------------------------------------
 int64u File::Size_Get(const Ztring &File_Name)
 {
- #if defined WINDOWS
- if (!IsWin9X())
- {
- WIN32_FILE_ATTRIBUTE_DATA Attributes;
- if (GetFileAttributesEx(File_Name.c_str(), GetFileExInfoStandard, &Attributes))
- return (((int64u)Attributes.nFileSizeHigh)<<32)+Attributes.nFileSizeLow;
- }
- #endif //defined WINDOWS
-
 File F(File_Name);
 return F.Size_Get();
 }
@@ -754,6 +836,9 @@
 //---------------------------------------------------------------------------
 bool File::Exists(const Ztring &File_Name)
 {
+ if (File_Name.find(__T('*'))!=std::string::npos || File_Name.find(__T('?'))!=std::string::npos)
+ return false;
+
 #ifdef ZENLIB_USEWX
 wxFileName FN(File_Name.c_str());
 return FN.FileExists();
@@ -770,9 +855,11 @@
 #elif defined WINDOWS
 #ifdef UNICODE
 DWORD FileAttributes;
- if (IsWin9X())
+ #ifndef ZENLIB_NO_WIN9X_SUPPORT
+ if (IsWin9X_Fast())
 FileAttributes=GetFileAttributesA(File_Name.To_Local().c_str());
 else
+ #endif //ZENLIB_NO_WIN9X_SUPPORT
 FileAttributes=GetFileAttributesW(File_Name.c_str());
 #else
 DWORD FileAttributes=GetFileAttributes(File_Name.c_str());
@@ -792,9 +879,11 @@
 return false;
 #elif defined WINDOWS
 #ifdef UNICODE
- if (IsWin9X())
+ #ifndef ZENLIB_NO_WIN9X_SUPPORT
+ if (IsWin9X_Fast())
 return CopyFileA(Source.To_Local().c_str(), Destination.To_Local().c_str(), !OverWrite)!=0;
 else
+ #endif //ZENLIB_NO_WIN9X_SUPPORT
 return CopyFileW(Source.c_str(), Destination.c_str(), !OverWrite)!=0;
 #else
 return CopyFile(Source.c_str(), Destination.c_str(), !OverWrite)!=0;
@@ -817,9 +906,11 @@
 return !std::rename(Source.To_Local().c_str(), Destination.To_Local().c_str());
 #elif defined WINDOWS
 #ifdef UNICODE
- if (IsWin9X())
+ #ifndef ZENLIB_NO_WIN9X_SUPPORT
+ if (IsWin9X_Fast())
 return MoveFileA(Source.To_Local().c_str(), Destination.To_Local().c_str())!=0;
 else
+ #endif //ZENLIB_NO_WIN9X_SUPPORT
 return MoveFileW(Source.c_str(), Destination.c_str())!=0;
 #else
 return MoveFile(Source.c_str(), Destination.c_str())!=0;
@@ -836,15 +927,17 @@
 #else //ZENLIB_USEWX
 #ifdef ZENLIB_STANDARD
 #ifdef UNICODE
- return remove(File_Name.To_Local().c_str())==0;
+ return unlink(File_Name.To_Local().c_str())==0;
 #else
- return remove(File_Name.c_str())==0;
+ return unlink(File_Name.c_str())==0;
 #endif //UNICODE
 #elif defined WINDOWS
 #ifdef UNICODE
- if (IsWin9X())
+ #ifndef ZENLIB_NO_WIN9X_SUPPORT
+ if (IsWin9X_Fast())
 return DeleteFileA(File_Name.To_Local().c_str())!=0;
 else
+ #endif //ZENLIB_NO_WIN9X_SUPPORT
 return DeleteFileW(File_Name.c_str())!=0;
 #else
 return DeleteFile(File_Name.c_str())!=0;

libzen_0.4.22.tar.bz2/Source/ZenLib/File.h -> libzen_0.4.28.tar.bz2/Source/ZenLib/File.h Changed

libzen_0.4.22.tar.bz2/Source/ZenLib/FileName.cpp -> libzen_0.4.28.tar.bz2/Source/ZenLib/FileName.cpp Changed

@@ -80,10 +80,10 @@
 #else //ZENLIB_USEWX
 #ifdef WINDOWS
 //Path limit
- size_t Pos_Path=rfind(_T('\\'));
+ size_t Pos_Path=rfind(__T('\\'));
 if (Pos_Path==Ztring::npos)
 {
- insert(0, 1, _T('\\')); //Not found
+ insert(0, 1, __T('\\')); //Not found
 Pos_Path=0;
 }
 replace(0, Pos_Path, Path, 0, Ztring::npos);
@@ -105,12 +105,14 @@
 #else //ZENLIB_USEWX
 size_t Pos_Path=rfind(FileName_PathSeparator); //Path limit
 if (Pos_Path==Ztring::npos)
- Pos_Path=(size_type)-1; //Not found
+ Pos_Path=0; //Not found
+ else
+ Pos_Path+=Ztring(FileName_PathSeparator).size(); //Path separator size
 //Extension limit
- size_t Pos_Ext=rfind(_T('.'));
+ size_t Pos_Ext=rfind(__T('.'));
 if (Pos_Ext==Ztring::npos || Pos_Ext<Pos_Path)
 Pos_Ext=size(); //Not found
- return Ztring(*this, Pos_Path+1, Pos_Ext-Pos_Path-1);
+ return Ztring(*this, Pos_Path, Pos_Ext-Pos_Path);
 #endif //ZENLIB_USEWX
 }
 
@@ -126,11 +128,11 @@
 #else //ZENLIB_USEWX
 #ifdef WINDOWS
 //Path limit
- size_t Pos_Path=rfind(_T('\\'));
+ size_t Pos_Path=rfind(__T('\\'));
 if (Pos_Path==Ztring::npos)
 Pos_Path=0; //Not found
 //Extension limit
- size_t Pos_Ext=rfind(_T('.'));
+ size_t Pos_Ext=rfind(__T('.'));
 if (Pos_Ext==Ztring::npos || Pos_Ext<Pos_Path)
 Pos_Ext=size(); //Not found
 replace(Pos_Path+1, Pos_Ext-Pos_Path-1, Name, 0, Ztring::npos);
@@ -153,7 +155,7 @@
 if (Pos_Path==Ztring::npos)
 Pos_Path=0; //Not found
 //Extension limit
- size_t Pos_Ext=rfind(_T('.'));
+ size_t Pos_Ext=rfind(__T('.'));
 if (Pos_Ext==Ztring::npos || Pos_Ext<Pos_Path)
 return Ztring(); //Not found
 else
@@ -171,14 +173,14 @@
 #else //ZENLIB_USEWX
 #ifdef WINDOWS
 //Path limit
- size_t Pos_Path=rfind(_T('\\'));
+ size_t Pos_Path=rfind(__T('\\'));
 if (Pos_Path==Ztring::npos)
 Pos_Path=0; //Not found
 //Extension limit
- size_t Pos_Ext=rfind(_T('.'));
+ size_t Pos_Ext=rfind(__T('.'));
 if (Pos_Ext==Ztring::npos || Pos_Ext<Pos_Path)
 {
- append(1, _T('.')); //Not found
+ append(1, __T('.')); //Not found
 Pos_Ext=size()-1;
 }
 replace(Pos_Ext+1, size()-Pos_Ext-1, Extension, 0, Ztring::npos);
@@ -210,7 +212,7 @@
 
 return Ztring(FileName);
 #else
- return _T("C:\\xxx.txt");
+ return __T("C:\\xxx.txt");
 #endif
 #endif //ZENLIB_USEWX
 }
@@ -221,16 +223,16 @@
 
 //End of line
 #ifdef __WINDOWS__
- const Char* FileName_PathSeparator=_T("\\");
+ const Char* FileName_PathSeparator=__T("\\");
 #endif
 #ifdef UNIX
- const Char* FileName_PathSeparator=_T("/");
+ const Char* FileName_PathSeparator=__T("/");
 #endif
 #ifdef MACOS
- const Char* FileName_PathSeparator=_T("/");
+ const Char* FileName_PathSeparator=__T("/");
 #endif
 #ifdef MACOSX
- const Char* FileName_PathSeparator=_T("/");
+ const Char* FileName_PathSeparator=__T("/");
 #endif
 
 } //namespace

libzen_0.4.22.tar.bz2/Source/ZenLib/Format/Html/Html_Handler.h -> libzen_0.4.28.tar.bz2/Source/ZenLib/Format/Html/Html_Handler.h Changed

libzen_0.4.22.tar.bz2/Source/ZenLib/Format/Html/Html_Request.h -> libzen_0.4.28.tar.bz2/Source/ZenLib/Format/Html/Html_Request.h Changed

libzen_0.4.22.tar.bz2/Source/ZenLib/Format/Http/Http_Cookies.cpp -> libzen_0.4.28.tar.bz2/Source/ZenLib/Format/Http/Http_Cookies.cpp Changed

libzen_0.4.22.tar.bz2/Source/ZenLib/Format/Http/Http_Cookies.h -> libzen_0.4.28.tar.bz2/Source/ZenLib/Format/Http/Http_Cookies.h Changed

libzen_0.4.22.tar.bz2/Source/ZenLib/Format/Http/Http_Handler.cpp -> libzen_0.4.28.tar.bz2/Source/ZenLib/Format/Http/Http_Handler.cpp Changed

libzen_0.4.22.tar.bz2/Source/ZenLib/Format/Http/Http_Handler.h -> libzen_0.4.28.tar.bz2/Source/ZenLib/Format/Http/Http_Handler.h Changed

@@ -47,7 +47,7 @@
 {
 
 //***************************************************************************
-/// @brief 
+/// @brief
 //***************************************************************************
 
 class Handler
@@ -61,12 +61,12 @@
 std::map<std::string, std::string> Request_Headers; //All the incoming HTTP headers from the client web browser.
 std::map<std::string, std::string> Request_Cookies; //The set of cookies that came from the client along with this request
 std::map<std::string, std::string> Request_Queries; //All the key/value pairs in the query string of this request
- std::string Foreign_IP; //The foreign ip address for this request 
+ std::string Foreign_IP; //The foreign ip address for this request
 std::string Local_IP; //The foreign port number for this request
- unsigned short Foreign_Port; //The IP of the local interface this request is coming in on 
- unsigned short Local_Port; //The local port number this request is coming in on 
+ unsigned short Foreign_Port; //The IP of the local interface this request is coming in on
+ unsigned short Local_Port; //The local port number this request is coming in on
 bool HeadersOnly; //The request requests only the header
- 
+
 //Out
 size_t Response_HTTP_Code; //HTTP code to be sent
 std::map<std::string, std::string> Response_Headers; //Additional headers you wish to appear in the HTTP response to this request

libzen_0.4.22.tar.bz2/Source/ZenLib/Format/Http/Http_Request.cpp -> libzen_0.4.28.tar.bz2/Source/ZenLib/Format/Http/Http_Request.cpp Changed

@@ -76,7 +76,7 @@
 }
 
 //***************************************************************************
-// 
+//
 //***************************************************************************
 
 //---------------------------------------------------------------------------
@@ -85,7 +85,7 @@
     //First line, "Method Path Norm"
     //-Method
     string Method;
-    In>>Method; 
+    In>>Method;
          if (Method.size()==3 && Method0=='G' && Method1=='E' && Method2=='T')
         ;
     else if (Method.size()==4 && Method0=='P' && Method1=='O' && Method2=='S' && Method3=='T')
@@ -111,7 +111,7 @@
     //-Norm
     string Line;
     getline(In, Line); //Drop the first line, no more needed
-    
+
     //Headers
     do
     {
@@ -119,7 +119,7 @@
         getline(In, Line);
         if (!Line.empty() && LineLine.size()-1=='\r')
             Line.resize(Line.size()-1); //Remove the \r
-        
+
         //Processing the line, form is "aaa: bbb"
         if (!Line.empty())
         {
@@ -145,7 +145,7 @@
                         }
                         else
                             Cookie.clear();
-                            
+
                         string::size_type Separator_Pos2=Line2.find('=');
                         if (Separator_Pos2!=string::npos)
                             Http->Request_CookiesLine2.substr(0, Separator_Pos2)=Format::Http::URL_Encoded_Decode(Line2.substr(Separator_Pos2+1, string::npos));
@@ -159,13 +159,13 @@
     while (!Line.empty());
 
     //Info
-    if (Method.size()==3 && Method0=='G' && Method1=='E' && Method2=='T'
-     || Method.size()==4 && Method0=='P' && Method1=='O' && Method2=='S' && Method3=='T')
+    if ((Method.size()==3 && Method0=='G' && Method1=='E' && Method2=='T')
+     || (Method.size()==4 && Method0=='P' && Method1=='O' && Method2=='S' && Method3=='T'))
     {
         do
         {
-            string Content; 
-            
+            string Content;
+
             //Getting the line
             string::size_type Interogation_Pos=Http->Path.find('?');
             if (Interogation_Pos!=string::npos)
@@ -173,7 +173,7 @@
                 Content=Http->Path.substr(Interogation_Pos+1, string::npos);
                 Http->Path.resize(Interogation_Pos);
             }
-            
+
             if (Method.size()==4) //Only for POST
             {
                 int64u Content_Lengh=0;
@@ -203,7 +203,7 @@
                 In.read(&ContentContent_Size_Current, (streamsize)Content_Lengh);
                 ContentContent_Size_Current+(size_t)Content_Lengh='\0';
             }
-            
+
             //Processing the line, form is "aaa=bbb&..."
             while (!Content.empty())
             {
@@ -215,7 +215,7 @@
                     Content.resize(Content_Pos);
                 else
                     Content.clear();
-                    
+
                 string::size_type Separator_Pos=Line2.find('=');
                 if (Separator_Pos!=string::npos)
                     Http->Request_QueriesLine2.substr(0, Separator_Pos)=Format::Http::URL_Encoded_Decode(Line2.substr(Separator_Pos+1, string::npos));

libzen_0.4.22.tar.bz2/Source/ZenLib/Format/Http/Http_Request.h -> libzen_0.4.28.tar.bz2/Source/ZenLib/Format/Http/Http_Request.h Changed

libzen_0.4.22.tar.bz2/Source/ZenLib/Format/Http/Http_Utils.cpp -> libzen_0.4.28.tar.bz2/Source/ZenLib/Format/Http/Http_Utils.cpp Changed

libzen_0.4.22.tar.bz2/Source/ZenLib/HTTP_Client/HTTPClient.c -> libzen_0.4.28.tar.bz2/Source/ZenLib/HTTP_Client/HTTPClient.c Changed

@@ -1,20 +1,20 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 //
-// Module Name: 
-// HTTPClient.c 
-// 
-// Abstract: Partially Implements the client side of the HTTP 1.1 Protocol as 
-// Defined in RFC 2616,2617 
-// Platform: Any that supports standard C calls and Berkeley sockets 
-// 
-// Author:	Eitan Michaelson 
-// Version: 1.0 
+// Module Name:
+// HTTPClient.c
+//
+// Abstract: Partially Implements the client side of the HTTP 1.1 Protocol as
+// Defined in RFC 2616,2617
+// Platform: Any that supports standard C calls and Berkeley sockets
+//
+// Author: Eitan Michaelson
+// Version: 1.0
 // Date 7/1/2006
 // Opens: HTTP Proxy authentication support (not fully tested).
-// HTTP Keep Alive not impliamented 
-// HTTPS not implemented 
-// The HTTP counters are not 100% correct (will be fixed) 
+// HTTP Keep Alive not impliamented
+// HTTPS not implemented
+// The HTTP counters are not 100% correct (will be fixed)
 //
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -27,15 +27,15 @@
 //
 // Function : HTTPClientSetLocalConnection
 // Purpose : TBD
-// Gets : 
-// Returns : 
+// Gets :
+// Returns :
 // Last updated : 01/09/2005
 //
 ///////////////////////////////////////////////////////////////////////////////
 
 UINT32 HTTPClientSetLocalConnection (HTTP_SESSION_HANDLE pSession, UINT32 nPort)
 {
- 
+
 return 0;
 }
 ///////////////////////////////////////////////////////////////////////////////
@@ -53,10 +53,10 @@
 
 P_HTTP_SESSION pHTTPSession = NULL; // Handle to the session pointer
 UINT32 nAllocationSize; // Size of the dynamically allocated buffer
- 
+
 // Attempt to allocate the buffer
 pHTTPSession = (P_HTTP_SESSION)malloc(ALIGN(sizeof(HTTP_SESSION)));
- 
+
 // Did we succeed?
 if(!pHTTPSession)
 {
@@ -65,14 +65,14 @@
 }
 // Reset the allocated space to zeros
 memset(pHTTPSession,0x00,sizeof(HTTP_SESSION));
- 
+
 // Allocate space for the incoming and outgoing headers
 // Check if the headers buffer is resizable
 if(HTTP_CLIENT_MEMORY_RESIZABLE)
 {
 // Memory is resizable, so use the init defined size or the maximum buffer size (which ever is smaller)
 nAllocationSize = MIN(HTTP_CLIENT_MAX_SEND_RECV_HEADERS,HTTP_CLIENT_INIT_SEND_RECV_HEADERS);
- 
+
 }
 else
 {
@@ -87,14 +87,14 @@
 // malloc() error, free the containing structure and exit.
 free(pHTTPSession);
 return 0;
- 
+
 }
- 
+
 // Reset the headers allocated memory
 memset(pHTTPSession->HttpHeaders.HeadersBuffer.pParam ,0x00,nAllocationSize);
 // Set the buffer length
 pHTTPSession->HttpHeaders.HeadersBuffer.nLength = nAllocationSize;
- 
+
 // Set default values in the session structure
 HTTPClientSetVerb((UINT32)pHTTPSession,(HTTP_VERB)HTTP_CLIENT_DEFAULT_VERB); // Default HTTP verb
 pHTTPSession->HttpUrl.nPort = HTTP_CLIENT_DEFAULT_PORT; // Default TCP port
@@ -103,10 +103,10 @@
 pHTTPSession->HttpHeaders.HeadersOut.pParam = pHTTPSession->HttpHeaders.HeadersBuffer.pParam;
 // Set our state
 pHTTPSession->HttpState = pHTTPSession->HttpState | HTTP_CLIENT_STATE_INIT;
- 
+
 // Save the flags
 pHTTPSession->HttpFlags = Flags;
- 
+
 // Reset the status
 pHTTPSession->HttpHeadersInfo.nHTTPStatus = 0;
 // Return an allocated session pointer (cast to UINT32 first)
@@ -125,18 +125,18 @@
 
 UINT32 HTTPClientReset (HTTP_SESSION_HANDLE pSession)
 {
- 
+
 P_HTTP_SESSION pHTTPSession = NULL;
- 
+
 // Cast the handle to our internal structure and check the pointers validity
 pHTTPSession = (P_HTTP_SESSION)pSession;
 if(!pHTTPSession)
 {
 return HTTP_CLIENT_ERROR_INVALID_HANDLE;
 }
- 
+
 return HTTPIntrnSessionReset(pHTTPSession,TRUE);
- 
+
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -151,7 +151,7 @@
 UINT32 HTTPClientCloseRequest (HTTP_SESSION_HANDLE *pSession)
 {
 P_HTTP_SESSION pHTTPSession = NULL;
- 
+
 // Cast the handle to our internal structure and check the pointers validity
 pHTTPSession = (P_HTTP_SESSION)*(pSession);
 if(!pHTTPSession)
@@ -159,7 +159,7 @@
 // User passed a bad pointer
 return HTTP_CLIENT_ERROR_INVALID_HANDLE;
 }
- 
+
 // Check for a valid pointer to the HTTP headers
 if(pHTTPSession->HttpHeaders.HeadersBuffer.pParam)
 {
@@ -170,10 +170,10 @@
 HTTPIntrnConnectionClose(pHTTPSession);
 // free the session structure
 free(pHTTPSession);
- 
- pHTTPSession = 0; // NULL the pointer 
+
+ pHTTPSession = 0; // NULL the pointer
 *(pSession) = 0;
- 
+
 return HTTP_CLIENT_SUCCESS;
 }
 
@@ -190,16 +190,16 @@
 UINT32 HTTPClientSetDebugHook (HTTP_SESSION_HANDLE pSession,
 E_HTTPDebug *pDebug) // IN Function pointer to the the caller debugging function)
 {
- 
+
 P_HTTP_SESSION pHTTPSession = NULL;
- 
+
 // Cast the handle to our internal structure and check the pointers validity
 pHTTPSession = (P_HTTP_SESSION)pSession;
 if(!pHTTPSession)
 {
 return HTTP_CLIENT_ERROR_INVALID_HANDLE;
 }
- 
+
 pHTTPSession->pDebug = pDebug;
 #ifdef _HTTP_DEBUGGING_
 if(pHTTPSession->pDebug)
@@ -207,8 +207,8 @@
 pHTTPSession->pDebug("HTTPClientSetDebugHook",NULL,0,"Debugging hook set, return code is %d",HTTP_CLIENT_SUCCESS);
 }
 #endif
- 
- 
+
+
 return HTTP_CLIENT_SUCCESS;
 }
 #endif
@@ -225,27 +225,27 @@
 UINT32 HTTPClientSetVerb (HTTP_SESSION_HANDLE pSession,
 HTTP_VERB HttpVerb) // IN Http verb (GET POST HEAD act')
 {
- 
+
 P_HTTP_SESSION pHTTPSession = NULL;
- 
- 
+
+
 // Cast the handle to our internal structure and check the pointers validity
 pHTTPSession = (P_HTTP_SESSION)pSession;
 if(!pHTTPSession)
 {
 return HTTP_CLIENT_ERROR_INVALID_HANDLE;
 }
- 
+
 #ifdef _HTTP_DEBUGGING_
 if(pHTTPSession->pDebug)
 {
 pHTTPSession->pDebug("HTTPClientSetVerb",NULL,0,"Selected Verb is %d",(INT32)HttpVerb);
 }
 #endif
- 
+
 // Cache the verb (as integer) for later use
 pHTTPSession->HttpHeaders.HttpVerb = HttpVerb;
- 
+
 // Convert the Verb parameter into its equivalent string representation
 switch (HttpVerb)
 {
@@ -255,7 +255,7 @@
 case VerbHead:
 if(!HTTP_CLIENT_ALLOW_HEAD_VERB)
 {
- return HTTP_CLIENT_ERROR_BAD_VERB; 
+ return HTTP_CLIENT_ERROR_BAD_VERB;
 }
 strcpy(pHTTPSession->HttpHeaders.Verb,"HEAD");
 break;
@@ -266,13 +266,13 @@
 // Unknown verb
 return HTTP_CLIENT_ERROR_BAD_VERB;
 };
- 
+
 return HTTP_CLIENT_SUCCESS;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 //
-// Function : HTTPClientSetVerb 
+// Function : HTTPClientSetVerb
 // Purpose : Sets the HTTP authentication schema
 // Returns : HTTP Status
 // Last updated : 01/09/2005
@@ -284,7 +284,7 @@
 void *pReserved)
 {
 P_HTTP_SESSION pHTTPSession = NULL;
- 
+
 // Cast the handle to our internal structure and check the pointers validity
 pHTTPSession = (P_HTTP_SESSION)pSession;
 if(!pHTTPSession)
@@ -297,7 +297,7 @@
 pHTTPSession->pDebug("HTTPClientSetAuth",NULL,0,"Selected authentication is %d",(INT32)AuthSchema);
 }
 #endif
- 
+
 switch(AuthSchema)
 {
 case(AuthSchemaBasic):
@@ -310,19 +310,19 @@
 strcpy(pHTTPSession->HttpCredentials.AuthSchemaName,"negotiate");
 break;
 };
- 
+
 if(AuthSchema >= AuthNotSupported)
 {
 return HTTP_CLIENT_ERROR_BAD_AUTH;
 }
- 
+
 pHTTPSession->HttpCredentials.CredAuthSchema = AuthSchema;
 return HTTP_CLIENT_SUCCESS;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 //
-// Function : HTTPClientSetProxy 
+// Function : HTTPClientSetProxy
 // Purpose : Sets all the proxy related parameters
 // Returns : HTTP Status
 // Last updated : 01/09/2005
@@ -336,7 +336,7 @@
 CHAR *pPassword) // IN User password for proxy authentication (can be null)
 {
 P_HTTP_SESSION pHTTPSession = NULL;
- 
+
 // Cast the handle to our internal structure and check the pointers validity
 pHTTPSession = (P_HTTP_SESSION)pSession;
 if(!pHTTPSession)
@@ -349,8 +349,8 @@
 pHTTPSession->pDebug("HTTPClientSetProxy",NULL,0,"Proxy host %s,Port %d, Username %s,Password %s",pProxyHost,nPort,pUserName,pPassword);
 }
 #endif
- 
- 
+
+
 // Cache the user supplied information in the internal session structure
 strncpy(pHTTPSession->HttpProxy.ProxyHost,pProxyHost,HTTP_CLIENT_MAX_PROXY_HOST_LENGTH);
 if(pUserName)
@@ -370,7 +370,7 @@
 // Set the proxy auyjentication schema
 if(pPassword && pUserName)
 {
- pHTTPSession->HttpProxy.ProxyAuthSchema = HTTP_CLIENT_DEFAULT_PROXY_AUTH; 
+ pHTTPSession->HttpProxy.ProxyAuthSchema = HTTP_CLIENT_DEFAULT_PROXY_AUTH;
 }
 return HTTP_CLIENT_SUCCESS;
 }
@@ -384,41 +384,41 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-UINT32 HTTPClientSetCredentials (HTTP_SESSION_HANDLE pSession, 
+UINT32 HTTPClientSetCredentials (HTTP_SESSION_HANDLE pSession,
 CHAR *pUserName, // IN Null terminated string containing the sessions user name
 CHAR *pPassword) // IN Null terminated string containing the sessions password
 {
 UINT32 nLength;
 P_HTTP_SESSION pHTTPSession = NULL;
- 
+
 // Cast the handle to our internal structure and check the pointers validity
 pHTTPSession = (P_HTTP_SESSION)pSession;
 if(!pHTTPSession)
 {
 return HTTP_CLIENT_ERROR_INVALID_HANDLE;
 }
- 
+
 // Get the length of the user name string and see if it's not too long
 nLength = strlen(pUserName);
 if(nLength > HTTP_CLIENT_MAX_USERNAME_LENGTH)
 {
 return HTTP_CLIENT_ERROR_LONG_INPUT;
 }
- 
+
 // Get the length of the password string and see if it's not too long
 nLength = strlen(pPassword);
 if(nLength > HTTP_CLIENT_MAX_PASSWORD_LENGTH)
 {
 return HTTP_CLIENT_ERROR_LONG_INPUT;
 }
- 
+
 // Copy them into our internal buffer
 strcpy(pHTTPSession->HttpCredentials.CredUser ,pUserName);
 strcpy(pHTTPSession->HttpCredentials.CredPassword ,pPassword);
- 
+
 // Set the authentication Boolean flag
 pHTTPSession->HttpHeadersInfo.HaveCredentials = TRUE;
- 
+
 return HTTP_CLIENT_SUCCESS;
 }
 
@@ -426,7 +426,7 @@
 //
 // Function : HTTPClientAddRequestHeaders
 // Purpose : Add headers to the outgoing request
-// Gets : 
+// Gets :
 // Last updated : 01/09/2005
 //
 ///////////////////////////////////////////////////////////////////////////////
@@ -436,40 +436,40 @@
 CHAR *pHeaderData, // IN The headers data
 BOOL nInsert) // IN Reserved could be any
 {
- 
+
 UINT32 nRetCode;
 UINT32 nHeaderLength,nDataLength;
 P_HTTP_SESSION pHTTPSession = NULL;
- 
+
 // Cast the handle to our internal structure and check the pointers validity
 pHTTPSession = (P_HTTP_SESSION)pSession;
 if(!pHTTPSession)
 {
 return HTTP_CLIENT_ERROR_INVALID_HANDLE;
 }
- 
+
 #ifdef _HTTP_DEBUGGING_
 if(pHTTPSession->pDebug)
 {
 pHTTPSession->pDebug("HTTPClientAddRequestHeaders",NULL,0,"Adding Header %s: %s",pHeaderName,pHeaderData);
 }
 #endif
- 
+
 // Get the elements length
 nHeaderLength = strlen(pHeaderName);
 nDataLength = strlen(pHeaderData);
- 
+
 // Call the internal function to add the headers to our session buffer
 nRetCode = HTTPIntrnHeadersAdd(pHTTPSession,pHeaderName,nHeaderLength,pHeaderData,nDataLength);
- 
+
 return nRetCode;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 // Function : HTTPClientSendRequest
-// Purpose : This function builds the request headers, performs a DNS resolution , 
-// opens the connection (if it was not opened yet by a previous request or if it has closed) 
+// Purpose : This function builds the request headers, performs a DNS resolution ,
+// opens the connection (if it was not opened yet by a previous request or if it has closed)
 // and sends the request headers.
 // Returns : HTTP Status
 // Last updated : 01/09/2005
@@ -480,11 +480,11 @@
 CHAR *pUrl, // IN The requested URL
 VOID *pData, // IN Data to post to the server
 UINT32 nDataLength, // IN Length of posted data
- BOOL TotalLength, // IN 
+ BOOL TotalLength, // IN
 UINT32 nTimeout, // IN Operation timeout
 UINT32 nClientPort) // IN Client side port 0 for none
 {
- 
+
 UINT32 nRetCode; // Function call return code
 UINT32 nBytes; // Bytes counter (socket operations)
 UINT32 nUrlLength; // Length of the given Url
@@ -493,7 +493,7 @@
 CHAR *pPtr; // Content length (string conversion)
 do
 {
- 
+
 // Cast the handle to our internal structure and check the pointers validity
 pHTTPSession = (P_HTTP_SESSION)pSession;
 if(!pHTTPSession)
@@ -501,21 +501,21 @@
 nRetCode = HTTP_CLIENT_ERROR_INVALID_HANDLE;
 break;
 }
- 
+
 #ifdef _HTTP_DEBUGGING_
 if(pHTTPSession->pDebug)
 {
 pHTTPSession->pDebug("HTTPClientSendRequest",NULL,0,"Url: %s",pUrl);
 }
 #endif
- 
+
 // Set the operation timeout counters
 pHTTPSession->HttpCounters.nActionStartTime = HTTPIntrnSessionGetUpTime();
 // 0 makes us use the default defined value
- pHTTPSession->HttpCounters.nActionTimeout = HTTP_TIMEOUT(nTimeout); 
+ pHTTPSession->HttpCounters.nActionTimeout = HTTP_TIMEOUT(nTimeout);
 // Store the cliebt port for later usage
 pHTTPSession->HttpConnection.HttpClientPort = nClientPort;
- 
+
 // Parse the URL
 nUrlLength = strlen(pUrl);
 nRetCode = HTTPIntrnSetURL(pHTTPSession,pUrl,nUrlLength);
@@ -523,7 +523,7 @@
 {
 break;
 }
- 
+
 // Create the default headers
 // Add the "Host" header. we should handle a special case of port incorporated within the host name.
 if((pHTTPSession->HttpFlags & HTTP_CLIENT_FLAG_URLANDPORT) != HTTP_CLIENT_FLAG_URLANDPORT)
@@ -565,7 +565,7 @@
 break;
 }
 }
- 
+
 // Add the "User-Agent" header
 if((nRetCode = HTTPIntrnHeadersAdd(pHTTPSession,"User-Agent",10,HTTP_CLIENT_DEFAULT_AGENT,strlen(HTTP_CLIENT_DEFAULT_AGENT)))!= HTTP_CLIENT_SUCCESS)
 {
@@ -590,7 +590,7 @@
 }
 }
 }
- 
+
 // If we know the total length in advance (only when posting)
 if(pHTTPSession->HttpHeaders.HttpVerb == VerbPost && TotalLength == TRUE)
 {
@@ -603,7 +603,7 @@
 break;
 }
 }
- 
+
 // Add the "Cache control" header (if requested by the caller)
 if((pHTTPSession->HttpFlags & HTTP_CLIENT_FLAG_NO_CACHE) == HTTP_CLIENT_FLAG_NO_CACHE)
 {
@@ -612,8 +612,8 @@
 break;
 }
 }
- 
- 
+
+
 // Now we can connect to the remote server and send the leading request followed by the HTTP headers
 // Check for timeout
 if(HTTPIntrnSessionEvalTimeout(pHTTPSession) == TRUE)
@@ -636,7 +636,7 @@
 break;
 }
 }
- 
+
 // Send the request along with the rest of the headers
 if(pHTTPSession->HttpCredentials.CredAuthSchema != AuthSchemaNone ||
 pHTTPSession->HttpProxy.ProxyAuthSchema != AuthSchemaNone) // If we have to authenticate we should use the HEAD verb
@@ -652,7 +652,7 @@
 }
 else
 {
- // Simply use the verb that was set by the caller without changing to HEAD 
+ // Simply use the verb that was set by the caller without changing to HEAD
 if((nRetCode = HTTPIntrnHeadersSend(pHTTPSession,pHTTPSession->HttpHeaders.HttpVerb)) != HTTP_CLIENT_SUCCESS)
 {
 break;
@@ -661,19 +661,19 @@
 // and he wishes to send the data right away
 if(pHTTPSession->HttpHeaders.HttpVerb == VerbPost && TotalLength == TRUE)
 {
- 
+
 // Send the data
- nBytes = nDataLength; 
+ nBytes = nDataLength;
 if((nRetCode = HTTPIntrnSend(pHTTPSession,pData,&nBytes)) != HTTP_CLIENT_SUCCESS)
- { 
+ {
 break;
 }
 // Set the session state
 pHTTPSession->HttpState = pHTTPSession->HttpState | HTTP_CLIENT_STATE_POST_SENT;
 }
- 
+
 }
- 
+
 // Retrive and analyze the Headers
 if((nRetCode = HTTPIntrnHeadersReceive(pHTTPSession,nTimeout)) != HTTP_CLIENT_SUCCESS)
 {
@@ -681,7 +681,7 @@
 }
 if(pHTTPSession->HttpHeadersInfo.nHTTPStatus != 401 && pHTTPSession->HttpHeadersInfo.nHTTPStatus != 407)
 {
- 
+
 nRetCode = HTTP_CLIENT_ERROR_AUTH_MISMATCH;
 break;
 }
@@ -690,7 +690,7 @@
 {
 break;
 }
- 
+
 }
 else
 {
@@ -704,21 +704,21 @@
 // and he wishes to send the data right away
 if(pHTTPSession->HttpHeaders.HttpVerb == VerbPost && TotalLength == TRUE)
 {
- 
+
 // Send the data
- nBytes = nDataLength; 
+ nBytes = nDataLength;
 if((nRetCode = HTTPIntrnSend(pHTTPSession,pData,&nBytes)) != HTTP_CLIENT_SUCCESS)
- { 
+ {
 break;
 }
 // Set the session state
 pHTTPSession->HttpState = pHTTPSession->HttpState | HTTP_CLIENT_STATE_POST_SENT;
 }
- 
+
 }while(0);
- 
- 
- 
+
+
+
 return nRetCode;
 }
 
@@ -735,18 +735,18 @@
 UINT32 HTTPClientRecvResponse (HTTP_SESSION_HANDLE pSession,
 UINT32 nTimeout) // IN Timeout for the operation
 {
- 
+
 UINT32 nRetCode; // Function return code
 P_HTTP_SESSION pHTTPSession = NULL; // Session pointer
- 
- 
+
+
 // Cast the handle to our internal structure and check the pointers validity
 pHTTPSession = (P_HTTP_SESSION)pSession;
 if(!pHTTPSession)
 {
 return HTTP_CLIENT_ERROR_INVALID_HANDLE;
 }
- 
+
 do
 {
 if((nRetCode = HTTPIntrnHeadersReceive(pHTTPSession, nTimeout)) != HTTP_CLIENT_SUCCESS)
@@ -754,9 +754,9 @@
 break;
 }
 } while(0);
- 
+
 return nRetCode;
- 
+
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -768,20 +768,20 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-UINT32 HTTPClientWriteData (HTTP_SESSION_HANDLE pSession, 
- VOID *pBuffer, 
+UINT32 HTTPClientWriteData (HTTP_SESSION_HANDLE pSession,
+ VOID *pBuffer,
 UINT32 nBufferLength,
 UINT32 nTimeout)
 {
- 
+
 UINT32 nRetCode = HTTP_CLIENT_SUCCESS;
 UINT32 nBytes;
 CHAR ChunkHTTP_CLIENT_MAX_CHUNK_HEADER;
 CHAR *pChunkHeaderPtr;
- 
+
 P_HTTP_SESSION pHTTPSession = NULL;
- 
- 
+
+
 // Cast the handle to our internal structure and check the pointer validity
 pHTTPSession = (P_HTTP_SESSION)pSession;
 do
@@ -791,11 +791,11 @@
 nRetCode = HTTP_CLIENT_ERROR_INVALID_HANDLE;
 break;
 }
- 
+
 // Set the operation timeout counters
 pHTTPSession->HttpCounters.nActionStartTime = HTTPIntrnSessionGetUpTime();
 pHTTPSession->HttpCounters.nActionTimeout = HTTP_TIMEOUT(nTimeout);
- 
+
 // Did the caller specified chunked sending?
 if((pHTTPSession->HttpFlags & HTTP_CLIENT_FLAG_SEND_CHUNKED) == HTTP_CLIENT_FLAG_SEND_CHUNKED)
 {
@@ -803,7 +803,7 @@
 memset(Chunk,0x00,HTTP_CLIENT_MAX_CHUNK_HEADER);
 pChunkHeaderPtr = HTTPStrLToH(Chunk,nBufferLength);
 strcat(Chunk,HTTP_CLIENT_CRLF);
- 
+
 // Send the leading CrLf (only after the first chunk)
 if(pHTTPSession->HttpCounters.nSentChunks >= 1)
 {
@@ -814,16 +814,16 @@
 break;
 }
 }
- 
+
 // Send the chunk header
 nBytes = strlen(Chunk);
 nRetCode = HTTPIntrnSend(pHTTPSession,Chunk,&nBytes);
 if(nRetCode != HTTP_CLIENT_SUCCESS)
 {
 break;
- } 
+ }
 }
- 
+
 // Send the data
 nBytes = nBufferLength;
 nRetCode = HTTPIntrnSend(pHTTPSession,pBuffer,&nBytes);
@@ -831,13 +831,13 @@
 {
 break;
 }
- 
+
 // If we are using chunks then..
 if((pHTTPSession->HttpFlags & HTTP_CLIENT_FLAG_SEND_CHUNKED) == HTTP_CLIENT_FLAG_SEND_CHUNKED)
 {
 // Set the chunks count
 pHTTPSession->HttpCounters.nSentChunks++;
- 
+
 // If it was the last chunk (0) we should re-get the headers from the server reply
 if(nBufferLength == 0)
 {
@@ -847,17 +847,17 @@
 if(nRetCode != HTTP_CLIENT_SUCCESS)
 {
 break;
- } 
- // Get the remote headers (since the last chunk was transmitted we can expect the server to start the reply) 
+ }
+ // Get the remote headers (since the last chunk was transmitted we can expect the server to start the reply)
 if((nRetCode = HTTPIntrnHeadersReceive(pHTTPSession,nTimeout)) != HTTP_CLIENT_SUCCESS)
 {
 break;
 }
 }
 }
- 
+
 } while(0);
- 
+
 return nRetCode;
 }
 
@@ -869,55 +869,55 @@
 // Last updated : 01/09/2005
 //
 ///////////////////////////////////////////////////////////////////////////////
- 
+
 UINT32 HTTPClientReadData (HTTP_SESSION_HANDLE pSession,
 VOID *pBuffer, // IN OUT a pointer to a buffer that will be filled with the servers response
 UINT32 nBytesToRead, // IN The size of the buffer (numbers of bytes to read)
 UINT32 nTimeout, // IN operation timeout in seconds
 UINT32 *nBytesRecived) // OUT Count of the bytes that ware received in this operation
 {
- 
+
 UINT32 nBytes = 0;
 UINT32 nRetCode = 0 ;
 INT32 nProjectedBytes = 0; // Should support negative numbers
 CHAR *pNullPtr;
 BOOL EndOfStream = FALSE;
- 
+
 P_HTTP_SESSION pHTTPSession = NULL;
- 
+
 // Cast the handle to our internal structure and check the pointers validity
 pHTTPSession = (P_HTTP_SESSION)pSession;
 if(!pHTTPSession)
 {
 return HTTP_CLIENT_ERROR_INVALID_HANDLE;
 }
- 
+
 // If the last verb that was used was HEAD there is no point to get this data (chanses are that we will endup with timeout)
 if(pHTTPSession->HttpHeaders.HttpVerb == VerbHead)
 {
 return HTTP_CLIENT_EOS;
- 
+
 }
- 
+
 // Set the operation timeout counters
 pHTTPSession->HttpCounters.nActionStartTime = HTTPIntrnSessionGetUpTime();
 pHTTPSession->HttpCounters.nActionTimeout = HTTP_TIMEOUT(nTimeout);
- 
- 
+
+
 nBytes = nBytesToRead - 1; // We will spare 1 byte for the trailing null termination
 *((CHAR*)pBuffer) = 0; // Null terminate the user supplied buffer
 *(nBytesRecived) = 0; // Set the return bytes count to 0
- 
+
 // We can read the data only if we got valid headers (and not authentication requests for example)
 if((pHTTPSession->HttpState & HTTP_CLIENT_STATE_HEADERS_PARSED) != HTTP_CLIENT_STATE_HEADERS_PARSED)
 {
 return HTTP_CLIENT_ERROR_BAD_STATE;
 }
- 
+
 // Is it a chunked mode transfer?
 if((pHTTPSession->HttpFlags & HTTP_CLIENT_FLAG_CHUNKED) == HTTP_CLIENT_FLAG_CHUNKED)
 {
- 
+
 // How many bytes left until the next chunk?
 if(pHTTPSession->HttpCounters.nBytesToNextChunk == 0)
 {
@@ -927,7 +927,7 @@
 // Could not parse the chunk parameter
 return HTTP_CLIENT_ERROR_CHUNK;
 }
- 
+
 // 0 Bytes chunk, we should return end of stream
 if(pHTTPSession->HttpCounters.nRecivedChunkLength == 0)
 {
@@ -943,34 +943,34 @@
 nBytes = pHTTPSession->HttpCounters.nBytesToNextChunk;
 }
 }
- 
+
 // Do we have the content length?
 if(pHTTPSession->HttpHeadersInfo.nHTTPContentLength > 0)
 {
- // Length of the projected buffer 
+ // Length of the projected buffer
 nProjectedBytes = pHTTPSession->HttpCounters.nRecivedBodyLength + nBytes;
 // If we are going to read more then the known content length then..
 if(nProjectedBytes >= (INT32)pHTTPSession->HttpHeadersInfo.nHTTPContentLength)
 {
 // Reduce the received bytes count to the correct size
 nBytes = pHTTPSession->HttpHeadersInfo.nHTTPContentLength - pHTTPSession->HttpCounters.nRecivedBodyLength;
- 
+
 }
 }
 // Receive the data from the socket
 nRetCode = HTTPIntrnRecv(pHTTPSession,(CHAR*)pBuffer,&nBytes,FALSE);
 // Set the return bytes count
 *(nBytesRecived) = nBytes; // + 1; Fixed 11/9/2005
- 
+
 // Pointer to the end of the buffer
- pNullPtr = (CHAR*)pBuffer + nBytes ; 
- // And null terminate 
+ pNullPtr = (CHAR*)pBuffer + nBytes ;
+ // And null terminate
 *pNullPtr = 0;
- 
+
 // Socket read went OK
 if(nRetCode == HTTP_CLIENT_SUCCESS)
 {
- 
+
 #ifdef _HTTP_DEBUGGING_
 if(pHTTPSession->pDebug)
 {
@@ -984,7 +984,7 @@
 {
 // If total received body is equal or greater then the known content length then..
 if( pHTTPSession->HttpCounters.nRecivedBodyLength >= pHTTPSession->HttpHeadersInfo.nHTTPContentLength)
- { 
+ {
 // Raise a flag to signal end of stream
 EndOfStream = TRUE;
 }
@@ -1002,12 +1002,12 @@
 return HTTP_CLIENT_EOS;
 }
 }
- 
+
 return nRetCode ;
 }
 ///////////////////////////////////////////////////////////////////////////////
 //
-// Function : HTTPClientGetInfo 
+// Function : HTTPClientGetInfo
 // Purpose : Fill the users structure with the session information
 // Returns : HTTP Status
 // Last updated : 01/09/2005
@@ -1017,7 +1017,7 @@
 UINT32 HTTPClientGetInfo (HTTP_SESSION_HANDLE pSession, HTTP_CLIENT *HTTPClient)
 {
 P_HTTP_SESSION pHTTPSession = NULL;
- 
+
 // Cast the handle to our internal structure and check the pointers validity
 pHTTPSession = (P_HTTP_SESSION)pSession;
 if(!pHTTPSession)
@@ -1026,7 +1026,7 @@
 }
 // Reset the users info structure
 memset(HTTPClient,0x00,sizeof(HTTP_CLIENT));
- 
+
 HTTPClient->HTTPStatusCode = pHTTPSession->HttpHeadersInfo.nHTTPStatus;
 HTTPClient->RequestBodyLengthSent = pHTTPSession->HttpCounters.nSentBodyBytes;
 HTTPClient->ResponseBodyLengthReceived = pHTTPSession->HttpCounters.nRecivedBodyLength;
@@ -1034,8 +1034,8 @@
 HTTPClient->HttpState = pHTTPSession->HttpState;
 
 return HTTP_CLIENT_SUCCESS;
- 
- 
+
+
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1049,17 +1049,17 @@
 
 UINT32 HTTPClientFindFirstHeader (HTTP_SESSION_HANDLE pSession, CHAR *pSearchClue,CHAR *pHeaderBuffer, UINT32 *nLength)
 {
- 
+
 P_HTTP_SESSION pHTTPSession = NULL;
 UINT32 nClueLength;
- 
+
 // Cast the handle to our internal structure and check the pointers validity
 pHTTPSession = (P_HTTP_SESSION)pSession;
 if(!pHTTPSession)
 {
 return HTTP_CLIENT_ERROR_INVALID_HANDLE;
 }
- 
+
 nClueLength = strlen(pSearchClue); // See if we are not to long
 if(nClueLength >= HTTP_CLIENT_MAX_HEADER_SEARCH_CLUE)
 {
@@ -1071,9 +1071,9 @@
 pHTTPSession->HttpHeaders.HeaderSearch.nLength = 0;
 pHTTPSession->HttpHeaders.HeaderSearch.pParam = NULL;
 }
- 
+
 return HTTP_CLIENT_SUCCESS;
- 
+
 }
 
 
@@ -1088,22 +1088,22 @@
 
 UINT32 HTTPClientFindCloseHeader (HTTP_SESSION_HANDLE pSession)
 {
- 
+
 P_HTTP_SESSION pHTTPSession = NULL;
- 
+
 // Cast the handle to our internal structure and check the pointers validity
 pHTTPSession = (P_HTTP_SESSION)pSession;
 if(!pHTTPSession)
 {
 return HTTP_CLIENT_ERROR_INVALID_HANDLE;
 }
- 
+
 pHTTPSession->HttpHeaders.SearchClue0 = 0;
 pHTTPSession->HttpHeaders.HeaderSearch.nLength = 0;
 pHTTPSession->HttpHeaders.HeaderSearch.pParam = NULL;
- 
+
 return HTTP_CLIENT_SUCCESS;
- 
+
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1116,13 +1116,13 @@
 ///////////////////////////////////////////////////////////////////////////////
 UINT32 HTTPClientGetNextHeader (HTTP_SESSION_HANDLE pSession, CHAR *pHeaderBuffer, UINT32 *nLength)
 {
- 
+
 P_HTTP_SESSION pHTTPSession = NULL;
 UINT32 nOffset = 0;
 UINT32 nRetCode;
 HTTP_PARAM HttpHeader;
 CHAR *pPtr;
- 
+
 // Cast the handle to our internal structure and check the pointers validity
 pHTTPSession = (P_HTTP_SESSION)pSession;
 if(!pHTTPSession)
@@ -1135,7 +1135,7 @@
 }
 // Search for the next header
 nRetCode = HTTPIntrnHeadersFind(pHTTPSession,pHTTPSession->HttpHeaders.SearchClue,&HttpHeader,TRUE,nOffset);
- 
+
 if(nRetCode == HTTP_CLIENT_SUCCESS)
 {
 if(HttpHeader.nLength > *(nLength)) // Check for sufficiant length
@@ -1144,7 +1144,7 @@
 pHeaderBuffer0 = 0; // Reset the users buffer
 return HTTP_CLIENT_ERROR_NO_MEMORY;
 }
- 
+
 pPtr = HttpHeader.pParam;
 nOffset = 0;
 if(*pPtr == 0x0d)
@@ -1157,19 +1157,19 @@
 nOffset++;
 pPtr++;
 }
- 
+
 strncpy(pHeaderBuffer,pPtr,HttpHeader.nLength - nOffset);
 pHeaderBufferHttpHeader.nLength - nOffset = 0;
 *(nLength) = HttpHeader.nLength - nOffset;
 pHTTPSession->HttpHeaders.HeaderSearch.pParam = HttpHeader.pParam + HttpHeader.nLength;
 pHTTPSession->HttpHeaders.HeaderSearch.nLength++;
- 
+
 return HTTP_CLIENT_SUCCESS;
- 
+
 }
- 
+
 return nRetCode;
- 
+
 }
 
 
@@ -1186,35 +1186,35 @@
 CHAR *pUrl, // IN a null terminated string containing the Url we should retrieve
 UINT32 nUrlLength) // IN The length the Url string
 {
- 
+
 UINT32 nUrlOffset; // Offset in bytes within the Url string
 HTTP_URL *pUrlPtr; // a Pointer to the Url structure (within the global session structure)
 CHAR *pPtr; // a Pointer for the Url port (Used in the parsing process)
 CHAR UrlPort16; // a temporary byte array for the Url port conversion operation (string to number)
- 
+
 // Check for the session pointer validity
 if(!pHTTPSession)
 {
 return HTTP_CLIENT_ERROR_INVALID_HANDLE;
 }
- 
- 
+
+
 // Get the length of the Url
 nUrlLength = strlen(pUrl);
- 
+
 // Check if it is not longer than the permitted length
 if((nUrlLength + 1) > HTTP_CLIENT_MAX_URL_LENGTH)
 {
 return HTTP_CLIENT_ERROR_LONG_INPUT;
 }
- 
+
 // Point the local pointer on the global structure
 pUrlPtr = &pHTTPSession->HttpUrl;
- 
+
 // Copy to the internal buffer
 memcpy(pHTTPSession->HttpUrl.Url,pUrl,nUrlLength);
 nUrlOffset = 0;
- 
+
 // Get the Url base ("http" or "https")
 if(HTTPStrSearch(pUrlPtr->Url,":",nUrlOffset,nUrlLength,&pUrlPtr->UrlBsee) == FALSE)
 {
@@ -1232,7 +1232,7 @@
 #ifdef _HTTP_BUILD_AMT
 // OS_GET_CLIENT_SUBSET_PROTOCOL(TRUE,&pHTTPSession->pSecProtocol);
 #endif
- 
+
 #ifdef _HTTP_DEBUGGING_
 if(pHTTPSession->pDebug)
 {
@@ -1245,7 +1245,7 @@
 if(HTTPStrInsensitiveCompare(pUrlPtr->UrlBsee.pParam,"http",pUrlPtr->UrlBsee.nLength) == FALSE)
 {
 return HTTP_CLIENT_ERROR_BAD_URL; // cOULD NOT DETECT http or https prefix
- 
+
 }
 }
 // Look for standard Url elements
@@ -1255,7 +1255,7 @@
 }
 // Increase the offset parameter
 nUrlOffset += 3;
- 
+
 // Get the host name
 if(HTTPStrSearch(pUrlPtr->Url,"/",nUrlOffset,(nUrlLength - nUrlOffset),&pUrlPtr->UrlHost) == FALSE)
 {
@@ -1266,9 +1266,9 @@
 return HTTP_CLIENT_ERROR_BAD_URL;
 }
 }
- 
+
 nUrlOffset += pUrlPtr->UrlHost.nLength;
- 
+
 // Do we have the port within the hostname?
 if(HTTPStrSearch(pUrlPtr->Url,":",
 (nUrlOffset - pUrlPtr->UrlHost.nLength),
@@ -1284,7 +1284,7 @@
 pPtr = UrlPort;
 while(*pPtr && pPtr++)
 {
- 
+
 pUrlPtr->UrlPort.nLength++;
 if(*pPtr == '/')
 {
@@ -1301,27 +1301,27 @@
 return HTTP_CLIENT_ERROR_BAD_URL;
 }
 }
- 
+
 // Get the request body
 pUrlPtr->UrlRequest.pParam = pUrlPtr->Url + nUrlOffset;
 pUrlPtr->UrlRequest.nLength = nUrlLength - nUrlOffset;
- 
+
 // If we got SSL url with no port we should set the default ssl port
 if((pHTTPSession->HttpFlags & HTTP_CLIENT_FLAG_URLHTTPS) == HTTP_CLIENT_FLAG_URLHTTPS)
 {
 if((pHTTPSession->HttpFlags & HTTP_CLIENT_FLAG_URLANDPORT) != HTTP_CLIENT_FLAG_URLANDPORT)
 {
 pHTTPSession->HttpUrl.nPort = HTTP_CLIENT_DEFAULT_SSL_PORT;
- 
+
 }
- 
+
 }
- 
+
 // Set the state flag
 pHTTPSession->HttpState = pHTTPSession->HttpState | HTTP_CLIENT_STATE_URL_PARSED;
- 
- return HTTP_CLIENT_SUCCESS; 
- 
+
+ return HTTP_CLIENT_SUCCESS;
+
 }
 
 
@@ -1337,10 +1337,10 @@
 static UINT32 HTTPIntrnResizeBuffer (P_HTTP_SESSION pHTTPSession,
 UINT32 nNewBufferSize) // IN The new (and larger) buffer size
 {
- 
+
 CHAR *pPtr = NULL;
 UINT32 nCurrentBufferSize;
- 
+
 if(!pHTTPSession)
 {
 return HTTP_CLIENT_ERROR_INVALID_HANDLE;
@@ -1348,11 +1348,11 @@
 // If the new buffer size is less or equal to the current buffer size then..
 if(pHTTPSession->HttpHeaders.HeadersBuffer.nLength >= nNewBufferSize)
 {
- 
+
 // Return an error (bad buffer)
 return HTTP_CLIENT_ERROR_BUFFER_RSIZE;
 }
- 
+
 // If the new buffer size is bigger then the defined maximum buffer size then..
 if(nNewBufferSize > HTTP_CLIENT_MAX_SEND_RECV_HEADERS)
 {
@@ -1368,7 +1368,7 @@
 // malloc() error
 return HTTP_CLIENT_ERROR_NO_MEMORY;
 }
- 
+
 // Copy the memory only if there is data to copy
 if(nCurrentBufferSize > 0)
 {
@@ -1381,12 +1381,12 @@
 // Reset the entire buffer (no previous buffer was copied)
 memset(pPtr,0x00,nNewBufferSize);
 }
- 
+
 free(pHTTPSession->HttpHeaders.HeadersBuffer.pParam);
- 
+
 pHTTPSession->HttpHeaders.HeadersBuffer.pParam = pPtr;
 pHTTPSession->HttpHeaders.HeadersBuffer.nLength = nNewBufferSize;
- 
+
 // Refresh the pointers
 pHTTPSession->HttpHeaders.HeadersOut.pParam = pHTTPSession->HttpHeaders.HeadersBuffer.pParam;
 if(pHTTPSession->HttpHeaders.HeadersIn.pParam)
@@ -1406,22 +1406,22 @@
 
 static UINT32 HTTPIntrnHeadersRemove (P_HTTP_SESSION pHTTPSession,
 CHAR *pHeaderName) // IN The header's name
- 
+
 {
- 
+
 HTTP_PARAM HttpParam;
 UINT32 nRetCode = HTTP_CLIENT_SUCCESS;
 UINT32 nBytes;
- 
+
 if(!pHTTPSession) // Pointer validation check
 {
 return HTTP_CLIENT_ERROR_INVALID_HANDLE;
 }
- 
+
 // First see if we have that header in our outgoing headers buffer
 do
 {
- 
+
 if((nRetCode = HTTPIntrnHeadersFind(pHTTPSession,pHeaderName,&HttpParam,FALSE,0)) != HTTP_CLIENT_SUCCESS)
 {
 // Could not find this header
@@ -1430,36 +1430,36 @@
 // Calculate the new headers length
 nBytes = (HttpParam.pParam - pHTTPSession->HttpHeaders.HeadersOut.pParam);
 nBytes -= HttpParam.nLength;
- 
- 
+
+
 // Copy the memory
 memcpy(HttpParam.pParam, HttpParam.pParam + HttpParam.nLength,nBytes);
- 
+
 // Set the new length
 pHTTPSession->HttpHeaders.HeadersOut.nLength -= HttpParam.nLength;
- 
+
 // Reset the buffer from it's modified end to it's previous end
 memset(pHTTPSession->HttpHeaders.HeadersOut.pParam + pHTTPSession->HttpHeaders.HeadersOut.nLength,0x00,HttpParam.nLength);
- 
+
 } while(0);
- 
+
 #ifdef _HTTP_DEBUGGING_
 if(pHTTPSession->pDebug)
 {
 pHTTPSession->pDebug("HTTPIntrnHeadersRemove",NULL,0,"Removing Header %",pHeaderName);
 }
 #endif
- 
- 
- return nRetCode; 
- 
+
+
+ return nRetCode;
+
 }
 
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 // Function : HTTPIntrnHeadersAdd
-// Purpose : Add HTTP headers to the outgoing headers buffers 
+// Purpose : Add HTTP headers to the outgoing headers buffers
 // Last updated : 01/09/2005
 //
 ///////////////////////////////////////////////////////////////////////////////
@@ -1476,23 +1476,23 @@
 INT32 nCurrentfreeSpace;
 INT32 nProjectedfreeSpace;
 UINT32 nRetCode;
- 
+
 if(!pHTTPSession) // pointer validation check
 {
 return HTTP_CLIENT_ERROR_INVALID_HANDLE;
 }
- 
+
 nProjectedHeaderLength = nNameLength + nDataLength + 4;
 nProjectedBufferLength = nProjectedHeaderLength + pHTTPSession->HttpHeaders.HeadersOut.nLength + pHTTPSession->HttpHeaders.HeadersIn.nLength;
 nCurrentfreeSpace = pHTTPSession->HttpHeaders.HeadersBuffer.nLength - (pHTTPSession->HttpHeaders.HeadersOut.nLength + pHTTPSession->HttpHeaders.HeadersIn.nLength);
 nProjectedfreeSpace = nCurrentfreeSpace - nProjectedHeaderLength;
- 
+
 // Check total size limit
 if(nProjectedBufferLength > HTTP_CLIENT_MAX_SEND_RECV_HEADERS)
 {
 return HTTP_CLIENT_ERROR_NO_MEMORY;
 }
- 
+
 if((INT32)nProjectedfreeSpace < 0)
 {
 if(HTTP_CLIENT_MEMORY_RESIZABLE == FALSE)
@@ -1510,21 +1510,21 @@
 }
 }
 }
- 
+
 // Move the incoming headers data within the buffer so we will have space for the added headers
 if(pHTTPSession->HttpHeaders.HeadersIn.pParam)
 {
 // Move the data and reset the data in the offset.
- memcpy(pHTTPSession->HttpHeaders.HeadersIn.pParam + nProjectedHeaderLength , 
+ memcpy(pHTTPSession->HttpHeaders.HeadersIn.pParam + nProjectedHeaderLength ,
 pHTTPSession->HttpHeaders.HeadersIn.pParam,
 pHTTPSession->HttpHeaders.HeadersIn.nLength);
 // Reset the space created
 memset(pHTTPSession->HttpHeaders.HeadersOut.pParam + pHTTPSession->HttpHeaders.HeadersOut.nLength,
 0x00,
 nProjectedHeaderLength);
- 
+
 }
- 
+
 pPtr = pHTTPSession->HttpHeaders.HeadersOut.pParam + pHTTPSession->HttpHeaders.HeadersOut.nLength;
 // Create the new header
 memcpy(pPtr,pHeaderName,nNameLength);
@@ -1535,18 +1535,18 @@
 pPtr += nDataLength;
 memcpy(pPtr,HTTP_CLIENT_CRLF,2);
 pPtr += 2;
- 
+
 // Set the new length
 pHTTPSession->HttpHeaders.HeadersOut.nLength += nProjectedHeaderLength;
- 
+
 #ifdef _HTTP_DEBUGGING_
 if(pHTTPSession->pDebug)
 {
 pHTTPSession->pDebug("HTTPIntrnHeadersAdd",NULL,0,"Adding Header %s: %s",pHeaderName,pHeaderData);
 }
 #endif
- 
- return HTTP_CLIENT_SUCCESS; 
+
+ return HTTP_CLIENT_SUCCESS;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1560,9 +1560,9 @@
 
 UINT32 HTTPIntrnConnectionClose (P_HTTP_SESSION pHTTPSession)
 {
- 
+
 INT32 nRetCode = HTTP_CLIENT_SUCCESS;
- 
+
 do
 {
 if(!pHTTPSession) // Validate the session pointer
@@ -1570,7 +1570,7 @@
 nRetCode = HTTP_CLIENT_ERROR_INVALID_HANDLE;
 break;
 }
- 
+
 // If we have a valid socket then..
 if(pHTTPSession->HttpConnection.HttpSocket != HTTP_INVALID_SOCKET)// INVALID_SOCKET
 {
@@ -1579,13 +1579,13 @@
 // TLS Close
 nRetCode = HTTPWrapperSSLClose(pHTTPSession->HttpConnection.HttpSocket);
 }
- 
+
 // Gracefully close it
 shutdown(pHTTPSession->HttpConnection.HttpSocket,0x01);
 closesocket(pHTTPSession->HttpConnection.HttpSocket);
 // And invalidate the socket
 pHTTPSession->HttpConnection.HttpSocket = HTTP_INVALID_SOCKET;
- 
+
 break;;
 }
 else
@@ -1594,9 +1594,9 @@
 nRetCode = HTTP_CLIENT_ERROR_SOCKET_INVALID;
 break;
 }
- 
+
 } while(0);
- 
+
 #ifdef _HTTP_DEBUGGING_
 if(pHTTPSession->pDebug)
 {
@@ -1620,14 +1620,14 @@
 INT32 nRetCode = HTTP_CLIENT_SUCCESS; // a function return code value
 UINT32 nNullOffset; // a helper value to null terminate a given string
 int nNonBlocking = 1; // non blocking mode parameter
- CHAR Backup; // a container for a char value (helps in temporary null termination) 
+ CHAR Backup; // a container for a char value (helps in temporary null termination)
 // HTTP_HOSTNET *HostEntry; // Socket host entry pointer
 UINT32 Address = 0;
 HTTP_SOCKADDR_IN ServerAddress; // Socket address structure
 HTTP_SOCKADDR_IN LoaclAddress; // Socket address structure (for client binding)
 do
 {
- 
+
 if(!pHTTPSession)
 {
 nRetCode = HTTP_CLIENT_ERROR_INVALID_HANDLE;
@@ -1640,20 +1640,20 @@
 pHTTPSession->HttpState = pHTTPSession->HttpState | HTTP_CLIENT_STATE_HOST_CONNECTED;
 return HTTP_CLIENT_SUCCESS;
 }
- // Zero the socket events 
- FD_ZERO(&pHTTPSession->HttpConnection.FDRead); 
- FD_ZERO(&pHTTPSession->HttpConnection.FDWrite); 
- FD_ZERO(&pHTTPSession->HttpConnection.FDError); 
- 
+ // Zero the socket events
+ FD_ZERO(&pHTTPSession->HttpConnection.FDRead);
+ FD_ZERO(&pHTTPSession->HttpConnection.FDWrite);
+ FD_ZERO(&pHTTPSession->HttpConnection.FDError);
+
 if(pHTTPSession->HttpConnection.HttpSocket == HTTP_INVALID_SOCKET)
 {
- 
+
 // Create a TCP/IP stream socket
- pHTTPSession->HttpConnection.HttpSocket = socket(AF_INET,	 // Address family 
- SOCK_STREAM,			 // Socket type 
- IPPROTO_TCP);		 // Protocol 
+ pHTTPSession->HttpConnection.HttpSocket = socket(AF_INET, // Address family
+ SOCK_STREAM, // Socket type
+ IPPROTO_TCP); // Protocol
 }
- 
+
 // Exit if we don't have a valid socket
 if(pHTTPSession->HttpConnection.HttpSocket == HTTP_INVALID_SOCKET)
 {
@@ -1674,28 +1674,28 @@
 // Prep the parameter
 if((pHTTPSession->HttpFlags & HTTP_CLIENT_FLAG_URLANDPORT) == HTTP_CLIENT_FLAG_URLANDPORT)
 {
- nNullOffset = pHTTPSession->HttpUrl.UrlHost.nLength - pHTTPSession->HttpUrl.UrlPort.nLength - 1; 
+ nNullOffset = pHTTPSession->HttpUrl.UrlHost.nLength - pHTTPSession->HttpUrl.UrlPort.nLength - 1;
 }
 else
 {
- nNullOffset = pHTTPSession->HttpUrl.UrlHost.nLength; 
+ nNullOffset = pHTTPSession->HttpUrl.UrlHost.nLength;
 }
- 
- Backup = HTTPStrExtract(pHTTPSession->HttpUrl.UrlHost.pParam,nNullOffset,0); 
+
+ Backup = HTTPStrExtract(pHTTPSession->HttpUrl.UrlHost.pParam,nNullOffset,0);
 // Resolve the host name
 nRetCode = HostByName(pHTTPSession->HttpUrl.UrlHost.pParam,&Address);
- 
+
 // Restore from backup (fix the buffer)
 HTTPStrExtract(pHTTPSession->HttpUrl.UrlHost.pParam,nNullOffset,Backup);
- 
+
 }
- 
+
 else
 {
 // Using a Proxy server so resolve the proxy host name
 nRetCode = HostByName(pHTTPSession->HttpProxy.ProxyHost,&Address);
 }
- 
+
 // See if we have a valid response from the net resolve operation
 /*
 if(nRetCode)
@@ -1705,29 +1705,29 @@
 }
 */
 // Reset the address structures
- memset(&ServerAddress, 0, sizeof(HTTP_SOCKADDR_IN)); 
- memset(&LoaclAddress, 0, sizeof(HTTP_SOCKADDR_IN)); 
- 
+ memset(&ServerAddress, 0, sizeof(HTTP_SOCKADDR_IN));
+ memset(&LoaclAddress, 0, sizeof(HTTP_SOCKADDR_IN));
+
 // Fill in the address structure
 ServerAddress.sin_family = AF_INET;
 #ifdef _HTTP_BUILD_AMT
 ServerAddress.sin_len = sizeof(HTTP_SOCKADDR_IN);
- ServerAddress.sin_addr.s_addr = htonl(Address); // Server's address 
+ ServerAddress.sin_addr.s_addr = htonl(Address); // Server's address
 #endif
 #ifdef _HTTP_BUILD_WIN32
- ServerAddress.sin_addr.s_addr = Address; // Server's address 
+ ServerAddress.sin_addr.s_addr = Address; // Server's address
 #endif
 if((pHTTPSession->HttpFlags & HTTP_CLIENT_FLAG_USINGPROXY) != HTTP_CLIENT_FLAG_USINGPROXY)
 {
 // Use the remote web server port
- ServerAddress.sin_port = htons(pHTTPSession->HttpUrl.nPort); // Host Port number 
+ ServerAddress.sin_port = htons(pHTTPSession->HttpUrl.nPort); // Host Port number
 }
 else
 {
 // Use the proxy port
- ServerAddress.sin_port = htons(pHTTPSession->HttpProxy.nProxyPort); // Proxy Port number 
+ ServerAddress.sin_port = htons(pHTTPSession->HttpProxy.nProxyPort); // Proxy Port number
 }
- 
+
 // Client-side Binding
 if(pHTTPSession->HttpConnection.HttpClientPort != 0)
 {
@@ -1736,36 +1736,36 @@
 LoaclAddress.sin_len = sizeof(HTTP_SOCKADDR_IN);
 #endif
 LoaclAddress.sin_port = htons((unsigned short)pHTTPSession->HttpConnection.HttpClientPort);
- 
+
 nRetCode = bind(pHTTPSession->HttpConnection.HttpSocket,
- (HTTP_SOCKADDR*)&LoaclAddress, 
+ (HTTP_SOCKADDR*)&LoaclAddress,
 sizeof(HTTP_SOCKADDR_IN));
- 
+
 if(nRetCode != 0)
 {
 nRetCode = HTTP_CLIENT_ERROR_SOCKET_BIND;
 }
 }
- 
+
 // Connect using TLS or otherwise clear connection
 if((pHTTPSession->HttpFlags & HTTP_CLIENT_FLAG_SECURE) == HTTP_CLIENT_FLAG_SECURE)
 { // Is it a TLS connection?
- nRetCode = HTTPWrapperSSLConnect(pHTTPSession->HttpConnection.HttpSocket,	// Socket
- (HTTP_SOCKADDR*)&ServerAddress,	 // Server address 
+ nRetCode = HTTPWrapperSSLConnect(pHTTPSession->HttpConnection.HttpSocket, // Socket
+ (HTTP_SOCKADDR*)&ServerAddress, // Server address
 sizeof(HTTP_SOCKADDR), // Length of server address structure
- "desktop");	 // Hostname (ToDo: Fix this)	 
+ "desktop"); // Hostname (ToDo: Fix this)
 }
 else // Non TLS so..
 {
- nRetCode = connect(pHTTPSession->HttpConnection.HttpSocket,	// Socket
- (HTTP_SOCKADDR*)&ServerAddress,			 // Server address 
- sizeof(HTTP_SOCKADDR));		 // Length of server address structure
+ nRetCode = connect(pHTTPSession->HttpConnection.HttpSocket, // Socket
+ (HTTP_SOCKADDR*)&ServerAddress, // Server address
+ sizeof(HTTP_SOCKADDR)); // Length of server address structure
 }
- 
+
 // The socket was set to be asyn so we should check the error being returned from connect()
 nRetCode = SocketGetErr(pHTTPSession->HttpConnection.HttpSocket);
 if(nRetCode == 0 || nRetCode == HTTP_EWOULDBLOCK || nRetCode == HTTP_EINPROGRESS)
- { 
+ {
 // Set TLS Nego flag to flase
 pHTTPSession->HttpConnection.TlsNego = FALSE;
 // Set the Write fd_sets for a socket connection event
@@ -1789,14 +1789,14 @@
 pHTTPSession->pDebug("HTTPIntrnConnectionOpen",NULL,0,"");
 }
 #endif
- 
- return nRetCode; 
+
+ return nRetCode;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 // Function : HTTPIntrnSend
-// Purpose : Send data to the remote server (Asynchronous sockets) 
+// Purpose : Send data to the remote server (Asynchronous sockets)
 // Returns : HTTP Status
 // Last updated : 01/09/2005
 //
@@ -1806,13 +1806,13 @@
 CHAR *pData, // IN a pointer to the data to be sent
 UINT32 *nLength) // IN OUT Length of data to send and the transmitted bytes count
 {
- 
+
 INT32 nSocketEvents; // Socket events center
 INT32 nRetCode = HTTP_CLIENT_SUCCESS; // a function return code value
 HTTP_TIMEVAL Timeval = { 1 , 0 }; // Timeout value for the socket() method
 HTTP_CONNECTION *pConnection = NULL; // Pointer for the connection structure
- 
- 
+
+
 do
 {
 // Validate the session pointer
@@ -1821,47 +1821,47 @@
 nRetCode = HTTP_CLIENT_ERROR_INVALID_HANDLE;
 break;
 }
- 
+
 // Have a pointer on the internal connection structure for simplifying code reading
 pConnection = &pHTTPSession->HttpConnection;
- 
+
 while(1)
 {
- 
+
 // Check for timeout
 if(HTTPIntrnSessionEvalTimeout(pHTTPSession) == TRUE)
 {
 nRetCode = HTTP_CLIENT_ERROR_SOCKET_TIME_OUT;
 break;
 }
- 
+
 // Reset socket events , only Error, since we don't want to get
- // a repeated Write events (socket is connected) 
- 
+ // a repeated Write events (socket is connected)
+
 FD_SET(pConnection->HttpSocket, &pConnection->FDError);
- 
+
 // See if we got any events on the socket
- nSocketEvents = select((pConnection->HttpSocket + 1), 0, 
+ nSocketEvents = select((pConnection->HttpSocket + 1), 0,
 &pConnection->FDWrite,
 &pConnection->FDError,
 &Timeval);
- 
- if(nSocketEvents < 0) // No events on the socket 
+
+ if(nSocketEvents < 0) // No events on the socket
 {
 *(nLength) = 0;
 break; // To-Do: This might be an error
 }
- 
+
 if(nSocketEvents == 0) // No new events so
 {
 continue; // restart this loop
 }
- 
- // Socket is writable (we are connected) so send the data 
+
+ // Socket is writable (we are connected) so send the data
 if(FD_ISSET(pConnection->HttpSocket ,&pConnection->FDWrite))
 {
- 
- // Send the data 
+
+ // Send the data
 if((pHTTPSession->HttpFlags & HTTP_CLIENT_FLAG_SECURE) == HTTP_CLIENT_FLAG_SECURE)
 {
 // TLS Protected connection
@@ -1876,11 +1876,11 @@
 }
 pConnection->TlsNego = TRUE;
 }
- nRetCode = HTTPWrapperSSLSend(pConnection->HttpSocket,pData,*(nLength),0); 
+ nRetCode = HTTPWrapperSSLSend(pConnection->HttpSocket,pData,*(nLength),0);
 }
 else
 {
- nRetCode = send(pConnection->HttpSocket,pData,*(nLength),0); 
+ nRetCode = send(pConnection->HttpSocket,pData,*(nLength),0);
 }
 if(nRetCode == SOCKET_ERROR)
 {
@@ -1891,10 +1891,10 @@
 // The data was sent to the remote server
 *(nLength) = nRetCode;
 nRetCode = HTTP_CLIENT_SUCCESS;
- break; 
+ break;
 }
- 
- // We had a socket related error 
+
+ // We had a socket related error
 if(FD_ISSET(pConnection->HttpSocket ,&pConnection->FDError))
 {
 FD_CLR((UINT32)pConnection->HttpSocket,&pConnection->FDError);
@@ -1905,15 +1905,15 @@
 }
 }
 } while(0);
- 
+
 #ifdef _HTTP_DEBUGGING_
 if(pHTTPSession->pDebug)
 {
 pHTTPSession->pDebug("HTTPIntrnSend",pData,*(nLength),"");
 }
 #endif
- 
- 
+
+
 return nRetCode;
 }
 
@@ -1936,7 +1936,7 @@
 INT32 nRetCode = HTTP_CLIENT_SUCCESS;
 HTTP_TIMEVAL Timeval = { 0, 50000 };
 HTTP_CONNECTION *pConnection = NULL;
- 
+
 do
 {
 if(!pHTTPSession)
@@ -1944,7 +1944,7 @@
 nRetCode = HTTP_CLIENT_ERROR_INVALID_HANDLE;
 break;
 }
- 
+
 // Set a pointer on the session internal connection structure (simplify code reading)
 pConnection = &pHTTPSession->HttpConnection;
 while(1)
@@ -1955,19 +1955,19 @@
 nRetCode = HTTP_CLIENT_ERROR_SOCKET_TIME_OUT;
 break;
 }
- 
- 
+
+
 // Reset socket events
- FD_SET(pConnection->HttpSocket, &pConnection->FDRead); 
- FD_SET(pConnection->HttpSocket, &pConnection->FDError); 
- 
+ FD_SET(pConnection->HttpSocket, &pConnection->FDRead);
+ FD_SET(pConnection->HttpSocket, &pConnection->FDError);
+
 // See if we got any events on the socket
- nSocketEvents = select(pConnection->HttpSocket + 1, &pConnection->FDRead, 
+ nSocketEvents = select(pConnection->HttpSocket + 1, &pConnection->FDRead,
 0,
 &pConnection->FDError,
 &Timeval);
- 
- if(nSocketEvents < 0) // Error or no new socket events 
+
+ if(nSocketEvents < 0) // Error or no new socket events
 {
 *(nLength) = 0;
 break;
@@ -1978,13 +1978,13 @@
 // This is a simple bypass for the TSL session (for some reason the socket read event is not set so
 // The pending bytes on the socket are being checked manualy.
 // TLS hack:
- 
- if((pHTTPSession->HttpFlags & HTTP_CLIENT_FLAG_SECURE) == HTTP_CLIENT_FLAG_SECURE)	
- { 
- nRetCode = 	HTTPWrapperSSLRecvPending(pConnection->HttpSocket);
+
+ if((pHTTPSession->HttpFlags & HTTP_CLIENT_FLAG_SECURE) == HTTP_CLIENT_FLAG_SECURE)
+ {
+ nRetCode = HTTPWrapperSSLRecvPending(pConnection->HttpSocket);
 if(nRetCode > 0)
 {
- // Recive without being notified by the socket event 
+ // Recive without being notified by the socket event
 if((nRetCode = HTTPWrapperSSLRecv(pConnection->HttpSocket,pData,*(nLength),0)) == SOCKET_ERROR)
 {
 // Socket error
@@ -1992,9 +1992,9 @@
 break;
 }
 *(nLength) = nRetCode;
- // Break on no data or server connection reset 
- if ( nRetCode == 0 || nRetCode == HTTP_ECONNRESET) 
- { 
+ // Break on no data or server connection reset
+ if ( nRetCode == 0 || nRetCode == HTTP_ECONNRESET)
+ {
 // Connection closed, simply break - this is not an error
 nRetCode = HTTP_CLIENT_EOS; // Signal end of stream
 break;
@@ -2007,17 +2007,17 @@
 // End Of the TLS bypass section
 //
 /////////////////////////////////////////////////////////////////////////////////////////////////
- 
+
 continue; // select() timed out - restart this loop
 }
 if(FD_ISSET(pConnection->HttpSocket ,&pConnection->FDRead)) // Are there any read events on the socket ?
 {
- // Clear the event 
+ // Clear the event
 FD_CLR((UINT32)pConnection->HttpSocket,&pConnection->FDRead);
- 
+
 // Socket is readable so so read the data
 if(PeekOnly == FALSE)
- { 
+ {
 // Get the data (secuure)
 if((pHTTPSession->HttpFlags & HTTP_CLIENT_FLAG_SECURE) == HTTP_CLIENT_FLAG_SECURE)
 {
@@ -2027,7 +2027,7 @@
 nRetCode = HTTP_CLIENT_ERROR_SOCKET_RECV;
 break;
 }
- } 
+ }
 else // Get the data (non secuure)
 {
 if((nRetCode = recv(pConnection->HttpSocket,pData,*(nLength),0)) == SOCKET_ERROR)
@@ -2037,7 +2037,7 @@
 break;
 }
 }
- 
+
 }
 else
 {
@@ -2048,13 +2048,13 @@
 nRetCode = HTTP_CLIENT_ERROR_SOCKET_RECV;
 break;
 }
- 
+
 }
 *(nLength) = nRetCode;
 // Break on no data or server connection reset
 // MSDN: If the connection has been gracefully closed, the return value is zero.
- if ( nRetCode == 0 || nRetCode == HTTP_ECONNRESET) 
- { 
+ if ( nRetCode == 0 || nRetCode == HTTP_ECONNRESET)
+ {
 // Connection closed, simply break - this is not an error
 nRetCode = HTTP_CLIENT_EOS; // Signal end of stream
 break;
@@ -2062,22 +2062,22 @@
 // We have successfully got the data from the server
 nRetCode = HTTP_CLIENT_SUCCESS;
 break;
- } 
- 
- // We had a socket related error 
+ }
+
+ // We had a socket related error
 if(FD_ISSET(pConnection->HttpSocket ,&pConnection->FDError))
 {
 FD_CLR((UINT32)pConnection->HttpSocket,&pConnection->FDError);
 *(nLength) = 0;
- 
+
 // To-Do: Handle this case
 nRetCode = HTTP_CLIENT_ERROR_SOCKET_RECV;
 break;
- 
+
 }
- } 
+ }
 }while(0);
- 
+
 return nRetCode;
 }
 
@@ -2094,13 +2094,13 @@
 
 static UINT32 HTTPIntrnGetRemoteChunkLength (P_HTTP_SESSION pHTTPSession)
 {
- 
+
 UINT32 nBytesRead = 1;
 UINT32 nRetCode = HTTP_CLIENT_SUCCESS;
 UINT32 nBytesCount = 0;
 CHAR ChunkHeaderHTTP_CLIENT_MAX_CHUNK_HEADER;
 CHAR *pPtr;
- 
+
 do
 {
 if(!pHTTPSession)
@@ -2108,12 +2108,12 @@
 nRetCode = HTTP_CLIENT_ERROR_INVALID_HANDLE;
 break;
 }
- 
+
 // Read byte by byte until we get a CrLf
 pPtr = ChunkHeader; // Get a pointer to the received buffer
 *pPtr = 0; // Terminate with null
- 
- while(nBytesRead > 0) 
+
+ while(nBytesRead > 0)
 {
 // Receive a single byte
 nRetCode = HTTPIntrnRecv(pHTTPSession,pPtr,&nBytesRead,FALSE);
@@ -2152,14 +2152,14 @@
 }
 }
 } while(0);
- 
+
 #ifdef _HTTP_DEBUGGING_
 if(pHTTPSession->pDebug)
 {
 pHTTPSession->pDebug("HTTPIntrnGetRemoteChunkLength",NULL,0,"Next chunk is %d bytes",pHTTPSession->HttpCounters.nRecivedChunkLength);
 }
 #endif
- 
+
 return nRetCode;
 }
 
@@ -2174,7 +2174,7 @@
 
 static UINT32 HTTPIntrnGetRemoteHeaders (P_HTTP_SESSION pHTTPSession)
 {
- 
+
 UINT32 nBytesRead = 1;
 UINT32 nRetCode = HTTP_CLIENT_SUCCESS;
 UINT32 nProjectedHeaderLength;
@@ -2182,7 +2182,7 @@
 INT32 nCurrentfreeSpace;
 INT32 nProjectedfreeSpace;
 CHAR *pPtr;
- 
+
 do
 {
 if(!pHTTPSession)
@@ -2190,20 +2190,20 @@
 nRetCode = HTTP_CLIENT_ERROR_INVALID_HANDLE;
 break;
 }
- 
+
 // Read byte by byte until we get CrLf followed by CrLf
 // Set the incoming headers pointer
- 
+
 if(!pHTTPSession->HttpHeaders.HeadersIn.pParam)
 {
 /// The incoming headers starts where the outgoing headers ends
 pHTTPSession->HttpHeaders.HeadersIn.pParam = pHTTPSession->HttpHeaders.HeadersOut.pParam + pHTTPSession->HttpHeaders.HeadersOut.nLength;
 }
- 
+
 // Receive until we get all the headers or any other error event
 while(nBytesRead > 0)
 {
- 
+
 // Size of the projected buffer we are going to receive
 nProjectedHeaderLength = nBytesRead;
 // Size of the projected total incoming buffer
@@ -2212,13 +2212,13 @@
 nCurrentfreeSpace = pHTTPSession->HttpHeaders.HeadersBuffer.nLength - (pHTTPSession->HttpHeaders.HeadersOut.nLength + pHTTPSession->HttpHeaders.HeadersIn.nLength);
 // Projected free space after the completion of the receive
 nProjectedfreeSpace = nCurrentfreeSpace - nProjectedHeaderLength;
- 
+
 // Check total size limit
 if(nProjectedBufferLength > HTTP_CLIENT_MAX_SEND_RECV_HEADERS)
 {
 return HTTP_CLIENT_ERROR_NO_MEMORY;
 }
- 
+
 if((INT32)nProjectedfreeSpace < 0)
 {
 if(HTTP_CLIENT_MEMORY_RESIZABLE == FALSE)
@@ -2241,19 +2241,19 @@
 pPtr = pHTTPSession->HttpHeaders.HeadersIn.pParam + pHTTPSession->HttpHeaders.HeadersIn.nLength;
 // Read a single byte
 nRetCode = HTTPIntrnRecv(pHTTPSession,pPtr,&nBytesRead,FALSE);
- 
+
 // ToDo: Break if not getting HTTP on the first 4 bytes
- 
+
 if(nRetCode == HTTP_CLIENT_SUCCESS && nBytesRead > 0)
 {
 // Advance the pointer by 1 byte
 pPtr += nBytesRead;
 // Increase the total receive length
 pHTTPSession->HttpHeaders.HeadersIn.nLength++;
- 
+
 // Set the HTTP counters
 pHTTPSession->HttpCounters.nRecivedHeaderLength++;
- 
+
 if(memcmp(pPtr - 4,HTTP_CLIENT_CRLFX2,4) == 0)
 {
 // Headers were received
@@ -2267,15 +2267,15 @@
 }
 }
 }while(0);
- 
- 
+
+
 #ifdef _HTTP_DEBUGGING_
 if(pHTTPSession->pDebug)
 {
 pHTTPSession->pDebug("HTTPIntrnGetRemoteHeaders",NULL,0,"Got %d bytes",pHTTPSession->HttpHeaders.HeadersIn.nLength);
 }
 #endif
- 
+
 return nRetCode;
 }
 
@@ -2288,7 +2288,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-static UINT32 HTTPIntrnHeadersFind (P_HTTP_SESSION pHTTPSession,CHAR *pHeaderName, 
+static UINT32 HTTPIntrnHeadersFind (P_HTTP_SESSION pHTTPSession,CHAR *pHeaderName,
 HTTP_PARAM *pParam, // OUT HTTP parameter structure that holds the search results
 BOOL IncommingHeaders, // IN Indicate if we are to search in the incoming or outgoing headers
 UINT32 nOffset) // IN Optionaly privide an offset to start looking from
@@ -2297,7 +2297,7 @@
 CHAR HeaderHTTP_CLIENT_MAX_HEADER_SEARCH_CLUE; // To-Do: Use pointers insted of fixed length
 UINT32 nLength;
 UINT32 nRetCode = HTTP_CLIENT_ERROR_HEADER_NOT_FOUND;
- 
+
 do
 {
 if(!pHTTPSession)
@@ -2305,7 +2305,7 @@
 nRetCode = HTTP_CLIENT_ERROR_INVALID_HANDLE;
 break;
 }
- 
+
 // Reset the input parameter structure
 pParam->pParam = NULL;
 pParam->nLength = 0;
@@ -2336,7 +2336,7 @@
 pHTTPSession->HttpHeaders.HeadersOut.nLength,
 Header);
 }
- 
+
 if(pParam->pParam) // Did we find it?
 {
 // Search for the token end (trailing CrLf)
@@ -2344,14 +2344,14 @@
 if(pHeaderEnd)
 {
 // Get the length (up to the CrLf)
- pParam->nLength = pHeaderEnd - pParam->pParam; 
+ pParam->nLength = pHeaderEnd - pParam->pParam;
 nRetCode = HTTP_CLIENT_SUCCESS;
 break;
- 
+
 }
 }
 }while(0);
- 
+
 // Could not find the header
 return nRetCode;
 }
@@ -2359,7 +2359,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 //
 // Function : HTTPIntrnAuthenticate
-// Purpose : 
+// Purpose :
 // Returns : HTTP Status
 // Last updated : 01/09/2005
 //
@@ -2372,8 +2372,8 @@
 UINT32 nTotalBytes = 0;
 CHAR ErrorPage32;
 BOOL NewConnection = FALSE;
- 
- 
+
+
 do
 {
 // Validate the session pointer
@@ -2382,7 +2382,7 @@
 nRetCode = HTTP_CLIENT_ERROR_INVALID_HANDLE;
 break;
 }
- 
+
 // Handle connection close message (reconnect)
 if(pHTTPSession->HttpHeadersInfo.Connection == FALSE)
 {
@@ -2397,10 +2397,10 @@
 {
 break;
 }
- 
+
 NewConnection = TRUE;
 }
- 
+
 // Analyze the security headers and optionally build the authentication reply header
 if((nRetCode = HTTPIntrnParseAuthHeader(pHTTPSession))!= HTTP_CLIENT_SUCCESS)
 {
@@ -2415,31 +2415,31 @@
 {
 break;
 }
- 
+
 nTotalBytes += nBytes;
 if(nTotalBytes >= pHTTPSession->HttpHeadersInfo.nHTTPContentLength)
 {
 break;
 }
 }
- 
+
 // Re-Send the headers after having analyzed the authorizaton headers
 if((nRetCode = HTTPIntrnHeadersSend(pHTTPSession,pHTTPSession->HttpHeaders.HttpVerb)) != HTTP_CLIENT_SUCCESS)
 {
 break;
 }
- 
+
 }while(0);
- 
+
 #ifdef _HTTP_DEBUGGING_
 if(pHTTPSession->pDebug)
 {
 pHTTPSession->pDebug("HTTPIntrnAuthenticate",NULL,0,"");
 }
 #endif
- 
+
 return nRetCode;
- 
+
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -2453,7 +2453,7 @@
 
 static UINT32 HTTPIntrnHeadersParse (P_HTTP_SESSION pHTTPSession)
 {
- 
+
 CHAR *pPtr; // a pointer that points on the incoming headers
 UINT32 nTokenLength = 0; // Length of the parsed token
 UINT32 nRetCode = HTTP_CLIENT_SUCCESS; // a function return code value
@@ -2461,7 +2461,7 @@
 CHAR HTTPTokenHTTP_CLIENT_MAX_TOKEN_LENGTH; // Buffer for the parsed HTTP token
 HTTP_PARAM HTTPParam; // A generic pointer\length parameter for parsing
 BOOL AuthHeaders = FALSE; // While we are searching the authentication methods
- 
+
 do
 {
 // Validate the session pointer
@@ -2470,25 +2470,25 @@
 nRetCode = HTTP_CLIENT_ERROR_INVALID_HANDLE;
 break;
 }
- 
+
 #ifdef _HTTP_DEBUGGING_
 if(pHTTPSession->pDebug)
 {
 pHTTPSession->pDebug("HTTPIntrnHeadersParse",pHTTPSession->HttpHeaders.HeadersIn.pParam,pHTTPSession->HttpHeaders.HeadersIn.nLength,"Incomming Headers");
 }
 #endif
- 
- 
+
+
 // Set a pointer on the incoming headers
 pPtr = pHTTPSession->HttpHeaders.HeadersIn.pParam;
- 
+
 // Detect the leading HTTP string
 if(HTTPStrInsensitiveCompare(pPtr,"http",4) != TRUE)
 {
 nRetCode = HTTP_CLIENT_ERROR_BAD_HEADER;
 break;
 }
- 
+
 // Get the HTTP Version
 while ((*pPtr) && (*pPtr != 0x20))
 {
@@ -2499,8 +2499,8 @@
 pPtr - nTokenLength,
 MIN(15,nTokenLength));
 pPtr++;
- 
- // Get the HTTP status code 
+
+ // Get the HTTP status code
 memset(HTTPToken,0x00,HTTP_CLIENT_MAX_TOKEN_LENGTH);
 nTokenLength = 0;
 while ((*pPtr) && (*pPtr != 0x20))
@@ -2509,15 +2509,15 @@
 pPtr++; // Move to the next space
 }
 strncpy(HTTPToken,(pPtr - nTokenLength),MIN(HTTP_CLIENT_MAX_TOKEN_LENGTH,nTokenLength));
- 
+
 pHTTPSession->HttpHeadersInfo.nHTTPStatus = atol(HTTPToken);
- 
+
 // Search for content length
 pHTTPSession->HttpHeadersInfo.nHTTPContentLength = 0; // Default no unknown length
 // Look for the token
 if(HTTPIntrnHeadersFind(pHTTPSession,"content-length",&HTTPParam,TRUE,0) == HTTP_CLIENT_SUCCESS)
 {
- 
+
 memset(HTTPToken,0x00,HTTP_CLIENT_MAX_TOKEN_LENGTH); // Reset the token buffer
 nTokenLength = HTTP_CLIENT_MAX_TOKEN_LENGTH; // Set the buffer length
 // Attempt to extract the token
@@ -2527,14 +2527,14 @@
 pHTTPSession->HttpHeadersInfo.nHTTPContentLength = atol(HTTPToken);
 }
 }
- 
+
 // Search for connection status
 pHTTPSession->HttpHeadersInfo.Connection = TRUE; // Default status where no server connection header was detected
 // Look for token (can be standard connection or a proxy connection)
 if( (HTTPIntrnHeadersFind(pHTTPSession,"connection",&HTTPParam,TRUE,0) == HTTP_CLIENT_SUCCESS) ||
 (HTTPIntrnHeadersFind(pHTTPSession,"proxy-connection",&HTTPParam,TRUE,0) == HTTP_CLIENT_SUCCESS))
 {
- 
+
 memset(HTTPToken,0x00,HTTP_CLIENT_MAX_TOKEN_LENGTH);
 nTokenLength = HTTP_CLIENT_MAX_TOKEN_LENGTH;
 // Attempt to extract the token
@@ -2547,14 +2547,14 @@
 {
 pHTTPSession->HttpHeadersInfo.Connection = FALSE;
 }
- } 
+ }
 }
- 
+
 // Search for chunking mode transfer
 pHTTPSession->HttpFlags = pHTTPSession->HttpFlags &~ HTTP_CLIENT_FLAG_CHUNKED; // Remove the flag
 if(HTTPIntrnHeadersFind(pHTTPSession,"transfer-encoding",&HTTPParam,TRUE,0) == HTTP_CLIENT_SUCCESS)
 {
- 
+
 memset(HTTPToken,0x00,HTTP_CLIENT_MAX_TOKEN_LENGTH);
 nTokenLength = HTTP_CLIENT_MAX_TOKEN_LENGTH;
 if(HTTPStrGetToken(HTTPParam.pParam,HTTPParam.nLength,HTTPToken,&nTokenLength))
@@ -2562,7 +2562,7 @@
 // If the chunks token was find then set the session flag accordingly
 if(HTTPStrInsensitiveCompare(HTTPToken,"chunked",0) == TRUE)
 {
- pHTTPSession->HttpFlags = pHTTPSession->HttpFlags | HTTP_CLIENT_FLAG_CHUNKED; 
+ pHTTPSession->HttpFlags = pHTTPSession->HttpFlags | HTTP_CLIENT_FLAG_CHUNKED;
 }
 }
 }
@@ -2582,10 +2582,10 @@
 {
 nRetCode = HTTP_CLIENT_ERROR_BAD_HEADER;
 }
- 
+
 break;
 }
- 
+
 // Make sure that we get an authentication header that maches the caller requested schema
 pPtr = HTTPStrCaseStr(pHTTPSession->HttpAuthHeader.AuthHeader.pParam,
 pHTTPSession->HttpAuthHeader.AuthHeader.nLength,
@@ -2605,7 +2605,7 @@
 AuthHeaders = TRUE;
 }
 }
- 
+
 // Is this a proxy authentication header?
 if(pHTTPSession->HttpHeadersInfo.nHTTPStatus == HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED)
 {
@@ -2616,7 +2616,7 @@
 break;
 }
 }
- 
+
 // Do we have a redirection response?
 if( (pHTTPSession->HttpHeadersInfo.nHTTPStatus == HTTP_STATUS_OBJECT_MOVED) ||
 (pHTTPSession->HttpHeadersInfo.nHTTPStatus == HTTP_STATUS_OBJECT_MOVED_PERMANENTLY))
@@ -2631,12 +2631,12 @@
 // Fix the pointers location (address the "Location: " prefix)
 pHTTPSession->HttpHeadersInfo.HttpRedirectURL.pParam += 12;
 pHTTPSession->HttpHeadersInfo.HttpRedirectURL.nLength -= 12;
- 
+
 }
- 
+
 }while(0);
- 
- 
+
+
 return nRetCode;
 }
 
@@ -2644,7 +2644,7 @@
 //
 // Function : HTTPIntrnParseAuthHeader
 // Purpose : Parse the HTTP headers for the required authentication method
-// Gets : 
+// Gets :
 // Returns : HTTP Status
 // Last updated : 01/09/2005
 //
@@ -2652,14 +2652,14 @@
 
 static UINT32 HTTPIntrnParseAuthHeader(P_HTTP_SESSION pHTTPSession)
 {
- 
+
 CHAR *pPtrStart, *pPtrEnd;
- 
+
 if(!pHTTPSession)
 {
 return HTTP_CLIENT_ERROR_INVALID_HANDLE;
 }
- 
+
 if(pHTTPSession->HttpProxy.ProxyAuthSchema != AuthSchemaNone)
 {
 // for proxy authentication simply assume basic and exit
@@ -2670,7 +2670,7 @@
 pPtrStart = pHTTPSession->HttpAuthHeader.AuthHeader.pParam;
 // Jump to the first space
 while ((pPtrEnd - pPtrStart) > 0 && *pPtrStart != 0x20) pPtrStart++;
- 
+
 do
 {
 if(HTTPStrCaseStr(pPtrStart,8,"basic"))
@@ -2678,7 +2678,7 @@
 pHTTPSession->HttpAuthHeader.HTTP_AUTH_SCHEMA = AuthSchemaBasic;
 break;
 }
- 
+
 if(HTTPStrCaseStr(pPtrStart,8,"digest"))
 {
 pHTTPSession->HttpAuthHeader.HTTP_AUTH_SCHEMA = AuthSchemaDigest;
@@ -2692,7 +2692,7 @@
 // To-Do: Add any other supported authentication method
 }
 while(0);
- 
+
 #ifdef _HTTP_DEBUGGING_
 if(pHTTPSession->pDebug)
 {
@@ -2700,22 +2700,22 @@
 pHTTPSession->HttpAuthHeader.AuthHeader.nLength,"Incomming Auth Headers: %d",pHTTPSession->HttpAuthHeader.HTTP_AUTH_SCHEMA);
 }
 #endif
- 
+
 // If we could not detect the authentication schema return an error
 if(pHTTPSession->HttpAuthHeader.HTTP_AUTH_SCHEMA == AuthSchemaNone)
 {
 return HTTP_CLIENT_ERROR_BAD_AUTH;
 }
- 
+
 //Make sure we are going to authenticate with the method specified by the caller
 if(pHTTPSession->HttpAuthHeader.HTTP_AUTH_SCHEMA != (UINT32)pHTTPSession->HttpCredentials.CredAuthSchema)
 {
 return HTTP_CLIENT_ERROR_AUTH_MISMATCH;
 }
- 
- 
+
+
 return HTTP_CLIENT_SUCCESS;
- 
+
 }
 
 
@@ -2724,7 +2724,7 @@
 // Function : HTTPIntrnHeadersSend
 // Purpose : Build and send the HTTP request. this includes the HTTP headers
 // and any required authentication data
-// Gets : 
+// Gets :
 // Returns : HTTP Status
 // Last updated : 01/09/2005
 //
@@ -2734,7 +2734,7 @@
 HTTP_VERB HttpVerb) // IN Argument that can bypass the requested verb
 // Can be used for evaluating a HEAD request
 {
- 
+
 UINT32 nBytes;
 UINT32 nRetCode = HTTP_CLIENT_SUCCESS;
 CHAR RequestCmd16;
@@ -2742,7 +2742,7 @@
 BOOL RestoreHeadersFlag = FALSE;
 HTTP_VERB HttpCachedVerb;
 CHAR *pPtr; // Content length conversion
- 
+
 if(!pHTTPSession)
 {
 // Bad session pointer error
@@ -2757,10 +2757,10 @@
 #endif
 // Cache the original VERB
 HttpCachedVerb = pHTTPSession->HttpHeaders.HttpVerb;
- 
+
 do
 {
- 
+
 // Set the verb (temporarily)
 if(pHTTPSession->HttpHeaders.HttpVerb != HttpVerb)
 {
@@ -2769,14 +2769,14 @@
 break;
 }
 }
- 
+
 // Remeber this state for later usage
 pHTTPSession->HttpHeaders.HttpLastVerb = pHTTPSession->HttpHeaders.HttpVerb;
- 
+
 // If this is a head request we should temporary remove the chunking header and the content length header
 if(pHTTPSession->HttpHeaders.HttpVerb == VerbHead)
 {
- 
+
 // If send in chunks flag was set
 if((pHTTPSession->HttpFlags & HTTP_CLIENT_FLAG_SEND_CHUNKED) == HTTP_CLIENT_FLAG_SEND_CHUNKED)
 {
@@ -2794,7 +2794,7 @@
 break;
 }
 }
- 
+
 RestoreHeadersFlag = TRUE; // So it would be restored later
 }
 // Request Verb
@@ -2803,19 +2803,19 @@
 strcpy(RequestCmd,pHTTPSession->HttpHeaders.Verb);
 strcat(RequestCmd," ");
 if((nRetCode = HTTPIntrnSend(pHTTPSession,RequestCmd,&nBytes)) != HTTP_CLIENT_SUCCESS)
- { 
+ {
 break;
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += nBytes;
- 
- 
+
+
 // Request URI
 if((pHTTPSession->HttpFlags & HTTP_CLIENT_FLAG_USINGPROXY) != HTTP_CLIENT_FLAG_USINGPROXY)
 {
 nBytes = pHTTPSession->HttpUrl.UrlRequest.nLength;
 if((nRetCode = HTTPIntrnSend(pHTTPSession,pHTTPSession->HttpUrl.UrlRequest.pParam,&nBytes)) != HTTP_CLIENT_SUCCESS)
- { 
+ {
 break;
 }
 // Set the counters
@@ -2825,7 +2825,7 @@
 {
 nBytes = strlen(pHTTPSession->HttpUrl.Url);
 if((nRetCode = HTTPIntrnSend(pHTTPSession,pHTTPSession->HttpUrl.Url,&nBytes)) != HTTP_CLIENT_SUCCESS)
- { 
+ {
 break;
 }
 // Set the counters
@@ -2837,13 +2837,13 @@
 strcat(RequestCmd,HTTP_CLIENT_DEFAULT_VER);
 strcat(RequestCmd,HTTP_CLIENT_CRLF);
 nBytes = strlen(RequestCmd);
- if((nRetCode = HTTPIntrnSend(pHTTPSession,RequestCmd,&nBytes)) != HTTP_CLIENT_SUCCESS) 
+ if((nRetCode = HTTPIntrnSend(pHTTPSession,RequestCmd,&nBytes)) != HTTP_CLIENT_SUCCESS)
 {
 break;
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += nBytes;
- 
+
 // Request headers
 nBytes = pHTTPSession->HttpHeaders.HeadersOut.nLength;
 if((nRetCode = HTTPIntrnSend(pHTTPSession,pHTTPSession->HttpHeaders.HeadersOut.pParam,&nBytes)) != HTTP_CLIENT_SUCCESS)
@@ -2852,17 +2852,17 @@
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += nBytes;
- 
+
 // Optionally add authentication headers and send them (for host or proxy authentication)
 if(pHTTPSession->HttpHeadersInfo.nHTTPStatus == HTTP_STATUS_UNAUTHORIZED || pHTTPSession->HttpHeadersInfo.nHTTPStatus == HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED )
 {
- 
+
 if((nRetCode = HTTPIntrnAuthHandler(pHTTPSession)) != HTTP_CLIENT_SUCCESS)
 {
 break;
 }
 }
- 
+
 // Request terminating CrLf
 nBytes = strlen(HTTP_CLIENT_CRLF);
 if((nRetCode = HTTPIntrnSend(pHTTPSession,HTTP_CLIENT_CRLF,&nBytes)) != HTTP_CLIENT_SUCCESS)
@@ -2871,7 +2871,7 @@
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += nBytes;
- 
+
 // Restore the verb
 if(pHTTPSession->HttpHeaders.HttpVerb != HttpCachedVerb)
 {
@@ -2880,7 +2880,7 @@
 break;
 }
 }
- 
+
 if(RestoreHeadersFlag == TRUE)
 {
 // Restore chunking header (since it was temporarily removed for the head request
@@ -2904,10 +2904,10 @@
 }
 // Set the session stage
 pHTTPSession->HttpState = pHTTPSession->HttpState | HTTP_CLIENT_STATE_REQUEST_SENT;
- 
+
 } while(0);
- 
- 
+
+
 return nRetCode; // end of HTTPIntrnSendHeaders()
 }
 
@@ -2916,7 +2916,7 @@
 // Function : HTTPIntrnAuthHandler
 // Purpose : Differentiate between the authenticate method that we have to implement and perform
 // the required operation.
-// Gets : 
+// Gets :
 // Returns : HTTP Status
 // Last updated : 01/09/2005
 //
@@ -2924,15 +2924,15 @@
 
 static UINT32 HTTPIntrnAuthHandler (P_HTTP_SESSION pHTTPSession)
 {
- 
+
 UINT32 nRetCode = HTTP_CLIENT_SUCCESS;
- 
+
 if(!pHTTPSession)
 {
 // Bad session pointer error
 return HTTP_CLIENT_ERROR_INVALID_HANDLE;
 }
- 
+
 if(pHTTPSession->HttpProxy.ProxyAuthSchema != AuthSchemaNone)
 {
 // For proxy authentication simply assume basic and exit
@@ -2940,8 +2940,8 @@
 nRetCode = HTTPIntrnAuthSendBasic(pHTTPSession);
 return nRetCode;
 }
- 
- 
+
+
 #ifdef _HTTP_DEBUGGING_
 if(pHTTPSession->pDebug)
 {
@@ -2949,40 +2949,40 @@
 0,"");
 }
 #endif
- 
+
 // Use the correct authentication method as requested by the server
 switch(pHTTPSession->HttpAuthHeader.HTTP_AUTH_SCHEMA)
 {
- 
+
 case AuthSchemaBasic:
 {
 // Basic authentication
 nRetCode = HTTPIntrnAuthSendBasic(pHTTPSession);
 break;
- 
+
 }
 case AuthSchemaDigest:
 {
 // Digest authentication
 nRetCode = HTTPIntrnAuthSendDigest(pHTTPSession);
 break;
- 
+
 }
 case AuthSchemaKerberos:
 {
 // ToDo: impliament the Kerberos nego authentication here
 nRetCode = HTTP_CLIENT_ERROR_NOT_IMPLEMENTED;
 break;
- 
+
 }
 default:
 {
 // Not supported method
 return HTTP_CLIENT_ERROR_BAD_AUTH; // Not implemented error
 }
- 
+
 };
- 
+
 // This session requested an authentication so..
 pHTTPSession->HttpCredentials.Authentication = TRUE;
 return nRetCode;
@@ -2992,7 +2992,7 @@
 //
 // Function : HTTPIntrnAuthSendBasic
 // Purpose : Handle basic authentication for direst host connection and proxy authentication
-// Gets : 
+// Gets :
 // Returns :
 // Last updated : 01/09/2005
 //
@@ -3001,17 +3001,17 @@
 
 static UINT32 HTTPIntrnAuthSendBasic (P_HTTP_SESSION pHTTPSession)
 {
- 
+
 UINT32 nSegmentLength;
 UINT32 nRetCode;
- CHAR CredHTTP_CLIENT_MAX_64_ENCODED_CRED /2; // Credentials (Clear) 
+ CHAR CredHTTP_CLIENT_MAX_64_ENCODED_CRED /2; // Credentials (Clear)
 CHAR Cred64HTTP_CLIENT_MAX_64_ENCODED_CRED; // Credentials (64 bit encoded)
 UINT32 nSrcLength, nDestLength;
 CHAR* pPtr;
 CHAR* INITIAL_HDR = "Authorization: Basic ";
 CHAR* INITIAL_PROXY_HDR = "Proxy-Authorization: Basic ";
- 
- 
+
+
 do
 {
 if(!pHTTPSession)
@@ -3019,7 +3019,7 @@
 nRetCode = HTTP_CLIENT_ERROR_INVALID_HANDLE;
 break;
 }
- 
+
 #ifdef _HTTP_DEBUGGING_
 if(pHTTPSession->pDebug)
 {
@@ -3027,35 +3027,35 @@
 0,"");
 }
 #endif
- 
+
 memset(Cred,0x00,HTTP_CLIENT_MAX_64_ENCODED_CRED /2);
 memset(Cred64,0x00,HTTP_CLIENT_MAX_64_ENCODED_CRED);
- 
- 
+
+
 switch (pHTTPSession->HttpHeadersInfo.nHTTPStatus)
 {
 case( HTTP_STATUS_UNAUTHORIZED): // For host authentication
 {
- 
+
 // Copy the clear text credentials to a format of user:password
 strcpy(Cred,pHTTPSession->HttpCredentials.CredUser);
 strcat(Cred,":");
 strcat(Cred,pHTTPSession->HttpCredentials.CredPassword);
 nSrcLength = strlen(Cred);
 nDestLength = HTTP_CLIENT_MAX_64_ENCODED_CRED;
- nSegmentLength = strlen(INITIAL_HDR); 
+ nSegmentLength = strlen(INITIAL_HDR);
 // Build and send the data first the hard-coded static portion
- if((nRetCode = HTTPIntrnSend(pHTTPSession,INITIAL_HDR, &nSegmentLength)) != HTTP_CLIENT_SUCCESS) 
+ if((nRetCode = HTTPIntrnSend(pHTTPSession,INITIAL_HDR, &nSegmentLength)) != HTTP_CLIENT_SUCCESS)
 {
 break;
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += nSegmentLength;
- 
+
 // Convert to base 64
 HTTPBase64Encoder((unsigned char *)Cred64,(CONST unsigned char *)Cred,nSrcLength);
 nDestLength = strlen(Cred64);
- 
+
 };
 break;
 case (HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED): // For Proxy authentication
@@ -3066,7 +3066,7 @@
 strcat(Cred,pHTTPSession->HttpProxy.ProxyPassword);
 nSrcLength = strlen(Cred);
 nDestLength = HTTP_CLIENT_MAX_64_ENCODED_CRED;
- 
+
 // Convert to base 64
 HTTPBase64Encoder((unsigned char *)Cred64,(unsigned char *)Cred,nSrcLength);
 nDestLength = strlen(Cred64);
@@ -3078,38 +3078,38 @@
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += nSegmentLength;
- 
+
 };
 break;
 default:
- { 
+ {
 return HTTP_CLIENT_ERROR_BAD_AUTH; // Wrong status for this function
 };
 };
- 
+
 // Send the base 64 encoded data
 pPtr = Cred64;
- if((nRetCode = HTTPIntrnSend(pHTTPSession,pPtr, &nDestLength)) != HTTP_CLIENT_SUCCESS) 
+ if((nRetCode = HTTPIntrnSend(pHTTPSession,pPtr, &nDestLength)) != HTTP_CLIENT_SUCCESS)
 {
 break;
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += nDestLength;
- 
+
 // Terminating CRLF
 nSegmentLength = strlen(HTTP_CLIENT_CRLF);
- if((nRetCode = HTTPIntrnSend(pHTTPSession,HTTP_CLIENT_CRLF, &nSegmentLength)) != HTTP_CLIENT_SUCCESS) 
+ if((nRetCode = HTTPIntrnSend(pHTTPSession,HTTP_CLIENT_CRLF, &nSegmentLength)) != HTTP_CLIENT_SUCCESS)
 {
 break;
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += nSegmentLength;
- 
- 
+
+
 } while (0);
- 
+
 return nRetCode;
- 
+
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -3130,8 +3130,8 @@
 UINT32 nAlgType = 0; // a flag for the algorithem type (default to MD5)
 HTTP_PARAM HttpParamOpq,HttpParamRealm,HttpParamNonce,HttpParamQop,HttpParamAlg; // Pointers and lengths of the dynamic sections
 // of the Digest response.
- 
- 
+
+
 // Fragments of the Digest client response (The hard coded text portion of the response)
 CHAR* INITIAL_HDR = "Authorization: Digest username=\"";
 CHAR* INITIAL_PROXY_HDR = "Proxy-Authorization: Digest username=\"";
@@ -3147,12 +3147,12 @@
 HASHHEX HA1;
 HASHHEX HA2 = "";
 HASHHEX Response;
- 
+
 if(!pHTTPSession)
 {
 return HTTP_CLIENT_ERROR_INVALID_HANDLE;
 }
- 
+
 #ifdef _HTTP_DEBUGGING_
 if(pHTTPSession->pDebug)
 {
@@ -3160,17 +3160,17 @@
 0,"");
 }
 #endif
- 
+
 // Generate random Cnonce number
 HTTPDigestGenerateCNonce(Cnonce);
- 
+
 switch (pHTTPSession->HttpHeadersInfo.nHTTPStatus)
 {
 case( HTTP_STATUS_UNAUTHORIZED): // For host authentication
 {
- // "Authorization: Digest username=" 
+ // "Authorization: Digest username="
 nSegmentLength = strlen(INITIAL_HDR);
- if((nRetCode = HTTPIntrnSend(pHTTPSession,INITIAL_HDR, &nSegmentLength)) != HTTP_CLIENT_SUCCESS) 
+ if((nRetCode = HTTPIntrnSend(pHTTPSession,INITIAL_HDR, &nSegmentLength)) != HTTP_CLIENT_SUCCESS)
 {
 return nRetCode;
 }
@@ -3182,7 +3182,7 @@
 {
 // "Proxy-Authorization: Digest username="
 nSegmentLength = strlen(INITIAL_PROXY_HDR);
- if((nRetCode = HTTPIntrnSend(pHTTPSession,INITIAL_PROXY_HDR, &nSegmentLength)) != HTTP_CLIENT_SUCCESS) 
+ if((nRetCode = HTTPIntrnSend(pHTTPSession,INITIAL_PROXY_HDR, &nSegmentLength)) != HTTP_CLIENT_SUCCESS)
 {
 return nRetCode;
 }
@@ -3195,10 +3195,10 @@
 return HTTP_CLIENT_ERROR_BAD_AUTH; // Wrong status for this function
 };
 };
- 
+
 do
 {
- 
+
 // "Authorization: Digest username="username
 nSegmentLength = strlen(pHTTPSession->HttpCredentials.CredUser);
 if((nRetCode = HTTPIntrnSend(pHTTPSession,pHTTPSession->HttpCredentials.CredUser, &nSegmentLength)) != HTTP_CLIENT_SUCCESS)
@@ -3207,17 +3207,17 @@
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += nSegmentLength;
- 
+
 // "Authorization: Digest username="username", realm="
 nSegmentLength = strlen(REALEM_HDR);
- if((nRetCode = HTTPIntrnSend(pHTTPSession,REALEM_HDR, &nSegmentLength)) != HTTP_CLIENT_SUCCESS) 
+ if((nRetCode = HTTPIntrnSend(pHTTPSession,REALEM_HDR, &nSegmentLength)) != HTTP_CLIENT_SUCCESS)
 {
 break;
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += nSegmentLength;
- 
- // "Authorization: Digest username="username", realm="realm 
+
+ // "Authorization: Digest username="username", realm="realm
 if((nRetCode = HTTPStrGetDigestToken(pHTTPSession->HttpAuthHeader.AuthHeader,"realm", &HttpParamRealm)) != HTTP_CLIENT_SUCCESS)
 {
 break;
@@ -3228,16 +3228,16 @@
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += HttpParamRealm.nLength;
- 
- // "Authorization: Digest username="username", realm="myRealm", qop="auth", 
+
+ // "Authorization: Digest username="username", realm="myRealm", qop="auth",
 nSegmentLength = strlen(QOP_HDR);
- if((nRetCode = HTTPIntrnSend(pHTTPSession,QOP_HDR, &nSegmentLength)) != HTTP_CLIENT_SUCCESS) 
+ if((nRetCode = HTTPIntrnSend(pHTTPSession,QOP_HDR, &nSegmentLength)) != HTTP_CLIENT_SUCCESS)
 {
 break;
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += nSegmentLength;
- 
+
 if((nRetCode = HTTPStrGetDigestToken(pHTTPSession->HttpAuthHeader.AuthHeader,"qop", &HttpParamQop)) != HTTP_CLIENT_SUCCESS)
 {
 break;
@@ -3248,10 +3248,10 @@
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += HttpParamQop.nLength;
- 
+
 // "Authorization: Digest username="username", realm="myRealm", qop="auth",
 // algorithm="MD5",
- 
+
 nSegmentLength = strlen(ALGO_HDR);
 if((nRetCode = HTTPIntrnSend(pHTTPSession,ALGO_HDR, &nSegmentLength)) != HTTP_CLIENT_SUCCESS)
 {
@@ -3259,22 +3259,22 @@
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += nSegmentLength;
- 
+
 if((nRetCode = HTTPStrGetDigestToken(pHTTPSession->HttpAuthHeader.AuthHeader,"algorithm", &HttpParamAlg)) != HTTP_CLIENT_SUCCESS)
 {
- 
+
 // The server did not state its required algorithm so use the default
 HttpParamAlg.pParam = HTTP_CLIENT_DEFAULT_DIGEST_AUTH;
 HttpParamAlg.nLength = strlen(HTTP_CLIENT_DEFAULT_DIGEST_AUTH);
 }
- // Get the algorithem type 
+ // Get the algorithem type
 if(HTTPStrInsensitiveCompare(HttpParamAlg.pParam ,"md5",3 ) == TRUE)
 {
 if(HTTPStrInsensitiveCompare(HttpParamAlg.pParam ,"md5-sess", HttpParamAlg.nLength) == TRUE)
 {
 nAlgType = 1;
 }
- 
+
 }
 else
 {
@@ -3282,7 +3282,7 @@
 nRetCode = HTTP_CLIENT_ERROR_NO_DIGEST_ALG;
 break;
 }
- 
+
 // Send the algorithem
 if((nRetCode = HTTPIntrnSend(pHTTPSession,HttpParamAlg.pParam, &HttpParamAlg.nLength)) != HTTP_CLIENT_SUCCESS)
 {
@@ -3290,8 +3290,8 @@
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += HttpParamAlg.nLength;
- 
- 
+
+
 // "Authorization: Digest username="username", realm="myRealm", qop="auth",
 // algorithm="MD5", uri="
 nSegmentLength = strlen(URI_HDR);
@@ -3299,19 +3299,19 @@
 {
 break;
 }
- 
- // "Authorization: Digest username="username", realm="myRealm", qop="auth", 
- // algorithm="MD5", uri="/....Service 
+
+ // "Authorization: Digest username="username", realm="myRealm", qop="auth",
+ // algorithm="MD5", uri="/....Service
 nSegmentLength = strlen(pHTTPSession->HttpUrl.UrlRequest.pParam);
- if((nRetCode = HTTPIntrnSend(pHTTPSession,pHTTPSession->HttpUrl.UrlRequest.pParam, &nSegmentLength)) != HTTP_CLIENT_SUCCESS) 
+ if((nRetCode = HTTPIntrnSend(pHTTPSession,pHTTPSession->HttpUrl.UrlRequest.pParam, &nSegmentLength)) != HTTP_CLIENT_SUCCESS)
 {
 break;
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += nSegmentLength;
- 
- 
- // "Authorization: Digest username="username", realm="myRealm", qop="auth", 
+
+
+ // "Authorization: Digest username="username", realm="myRealm", qop="auth",
 // algorithm="MD5", uri="/....Service", nonce="
 nSegmentLength = strlen(NONCE_HDR);
 if((nRetCode = HTTPIntrnSend(pHTTPSession,NONCE_HDR, &nSegmentLength)) != HTTP_CLIENT_SUCCESS)
@@ -3320,8 +3320,8 @@
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += nSegmentLength;
- 
- 
+
+
 // "Authorization: Digest username="username", realm="myRealm", qop="auth",
 // algorithm="MD5", uri="/....Service", nonce="7a5c...
 if((nRetCode = HTTPStrGetDigestToken(pHTTPSession->HttpAuthHeader.AuthHeader,"nonce", &HttpParamNonce)) != HTTP_CLIENT_SUCCESS)
@@ -3334,31 +3334,31 @@
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += HttpParamNonce.nLength;
- 
- // "Authorization: Digest username="username", realm="myRealm", qop="auth", 
+
+ // "Authorization: Digest username="username", realm="myRealm", qop="auth",
 // algorithm="MD5", uri="/....Service", nonce="7a5c...", nc=00000001, cnonce="
 nSegmentLength = strlen(NC_HDR);
- if((nRetCode = HTTPIntrnSend(pHTTPSession,NC_HDR, &nSegmentLength)) != HTTP_CLIENT_SUCCESS) 
+ if((nRetCode = HTTPIntrnSend(pHTTPSession,NC_HDR, &nSegmentLength)) != HTTP_CLIENT_SUCCESS)
 {
 break;
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += nSegmentLength;
- 
+
 // "Authorization: Digest username="username", realm="myRealm", qop="auth",
- // algorithm="MD5", uri="/....Service", nonce="7a5c...", nc=00000001, cnonce="ab341... 
+ // algorithm="MD5", uri="/....Service", nonce="7a5c...", nc=00000001, cnonce="ab341...
 nSegmentLength = strlen(Cnonce);
- if((nRetCode = HTTPIntrnSend(pHTTPSession,Cnonce, &nSegmentLength)) != HTTP_CLIENT_SUCCESS) 
+ if((nRetCode = HTTPIntrnSend(pHTTPSession,Cnonce, &nSegmentLength)) != HTTP_CLIENT_SUCCESS)
 {
 break;
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += nSegmentLength;
- 
+
 // Send the opaque data if we got it from the server
 if((nRetCode = HTTPStrGetDigestToken(pHTTPSession->HttpAuthHeader.AuthHeader,"opaque", &HttpParamOpq)) == HTTP_CLIENT_SUCCESS)
 {
- 
+
 nSegmentLength = strlen(OPQ_HDR);
 if((nRetCode = HTTPIntrnSend(pHTTPSession,OPQ_HDR, &nSegmentLength)) != HTTP_CLIENT_SUCCESS)
 {
@@ -3372,10 +3372,10 @@
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += HttpParamOpq.nLength;
- 
+
 }
- 
- // "Authorization: Digest username="username", realm="myRealm", qop="auth", 
+
+ // "Authorization: Digest username="username", realm="myRealm", qop="auth",
 // algorithm="MD5", uri="/....Service", nonce="7a5c...", nc=00000001, cnonce="ab341...", response="
 nSegmentLength = strlen(RSP_HDR);
 if((nRetCode = HTTPIntrnSend(pHTTPSession,RSP_HDR, &nSegmentLength)) != HTTP_CLIENT_SUCCESS)
@@ -3384,23 +3384,23 @@
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += nSegmentLength;
- 
+
 // Calculate response
 HTTPDigestCalcHA1(nAlgType, pHTTPSession->HttpCredentials.CredUser,
 HttpParamRealm.pParam,HttpParamRealm.nLength ,
 pHTTPSession->HttpCredentials.CredPassword ,
 HttpParamNonce.pParam, HttpParamNonce.nLength,
 Cnonce, HA1);
- 
+
 HTTPDigestCalcResponse(HA1,
- HttpParamNonce.pParam, HttpParamNonce.nLength, 
- "00000001", Cnonce, 
+ HttpParamNonce.pParam, HttpParamNonce.nLength,
+ "00000001", Cnonce,
 HttpParamQop.pParam,HttpParamQop.nLength, pHTTPSession->HttpHeaders.Verb,
 pHTTPSession->HttpUrl.UrlRequest.pParam,pHTTPSession->HttpUrl.UrlRequest.nLength,
 HA2, Response);
- 
- // "Authorization: Digest username="username", realm="myRealm", qop="auth", 
- // algorithm="MD5", uri="/....Service", nonce="7a5c...", nc=00000001, cnonce="ab341...", response="8bbf2... 
+
+ // "Authorization: Digest username="username", realm="myRealm", qop="auth",
+ // algorithm="MD5", uri="/....Service", nonce="7a5c...", nc=00000001, cnonce="ab341...", response="8bbf2...
 nSegmentLength = strlen(Response);
 if((nRetCode = HTTPIntrnSend(pHTTPSession,Response, &nSegmentLength)) != HTTP_CLIENT_SUCCESS)
 {
@@ -3408,28 +3408,28 @@
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += nSegmentLength;
- 
- 
+
+
 // Terminate 0x24 (")
 nSegmentLength = 1;
- if((nRetCode = HTTPIntrnSend(pHTTPSession,"\"", &nSegmentLength)) != HTTP_CLIENT_SUCCESS) 
+ if((nRetCode = HTTPIntrnSend(pHTTPSession,"\"", &nSegmentLength)) != HTTP_CLIENT_SUCCESS)
 {
 break;
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += nSegmentLength;
- 
+
 // Terminating CRLF
 nSegmentLength = strlen(HTTP_CLIENT_CRLF);
- if((nRetCode = HTTPIntrnSend(pHTTPSession,HTTP_CLIENT_CRLF, &nSegmentLength)) != HTTP_CLIENT_SUCCESS) 
+ if((nRetCode = HTTPIntrnSend(pHTTPSession,HTTP_CLIENT_CRLF, &nSegmentLength)) != HTTP_CLIENT_SUCCESS)
 {
 break;
 }
 // Set the counters
 pHTTPSession->HttpCounters.nSentHeaderBytes += nSegmentLength;
- 
+
 } while(0);
- 
+
 return nRetCode; // End of digest respobse sending
 }
 
@@ -3446,13 +3446,13 @@
 {
 UINT32 nActionTimeout; // For restoring a parameter after this reset
 UINT32 nAllocationSize;
- 
+
 // Validate the pointer
 if(!pHTTPSession)
 {
 return HTTP_CLIENT_ERROR_INVALID_HANDLE;
 }
- 
+
 #ifdef _HTTP_DEBUGGING_
 if(pHTTPSession->pDebug)
 {
@@ -3460,12 +3460,12 @@
 0,"");
 }
 #endif
- 
- 
+
+
 memset(pHTTPSession->HttpHeaders.HeadersIn.pParam,0x00,pHTTPSession->HttpHeaders.HeadersIn.nLength);
 pHTTPSession->HttpHeaders.HeadersIn.nLength = 0;
- 
- 
+
+
 // Reset the HTTP counters
 nActionTimeout = pHTTPSession->HttpCounters.nActionTimeout;
 memset(&pHTTPSession->HttpCounters,0x00,sizeof(HTTP_COUNTERS));
@@ -3474,26 +3474,26 @@
 pHTTPSession->HttpCounters.nActionTimeout = nActionTimeout;
 // Reset the authentication flag
 pHTTPSession->HttpCredentials.Authentication = FALSE;
- 
- 
+
+
 if(EntireSession == TRUE) // Partial reset, clear only the incoming headers
 {
 memset(&pHTTPSession->HttpUrl,0,sizeof(HTTP_URL));
 nAllocationSize = pHTTPSession->HttpHeaders.HeadersBuffer.nLength;
 // Reset the headers allocated memory
 memset(pHTTPSession->HttpHeaders.HeadersBuffer.pParam ,0x00,nAllocationSize);
- 
+
 // Set default values in the session structure
 HTTPClientSetVerb((UINT32)pHTTPSession,(HTTP_VERB)HTTP_CLIENT_DEFAULT_VERB); // Default HTTP verb
 pHTTPSession->HttpUrl.nPort = HTTP_CLIENT_DEFAULT_PORT; // Default TCP port
 // Set the outgoing headers pointers
 memset(&pHTTPSession->HttpHeaders.HeadersIn,0,sizeof(HTTP_PARAM));
 memset(&pHTTPSession->HttpHeaders.HeadersOut,0,sizeof(HTTP_PARAM));
- 
+
 pHTTPSession->HttpHeaders.HeadersOut.pParam = pHTTPSession->HttpHeaders.HeadersBuffer.pParam;
 // Set our state
 pHTTPSession->HttpState = pHTTPSession->HttpState | HTTP_CLIENT_STATE_INIT;
- 
+
 memset(&pHTTPSession->HttpHeadersInfo,0,sizeof(HTTP_HEADERS_INFO));
 if(pHTTPSession->HttpConnection.HttpSocket != HTTP_INVALID_SOCKET)
 {
@@ -3501,11 +3501,11 @@
 }
 memset(&pHTTPSession->HttpAuthHeader,0,sizeof(HTTP_AUTH_HEADER));
 memset(&pHTTPSession->HttpProxy,0,sizeof(HTTP_PROXY));
- 
+
 }
- 
+
 return HTTP_CLIENT_SUCCESS;
- 
+
 }
 
 
@@ -3521,9 +3521,9 @@
 
 static UINT32 HTTPIntrnHeadersReceive (P_HTTP_SESSION pHTTPSession,
 UINT32 nTimeout) // IN Timeout for the operation
- 
+
 {
- 
+
 UINT32 nRetCode; // Function call return code
 UINT32 nCount = 0;
 if(!pHTTPSession)
@@ -3531,43 +3531,43 @@
 // Bad session pointer error
 return HTTP_CLIENT_ERROR_INVALID_HANDLE;
 }
- 
+
 do
 {
- 
- 
+
+
 // Set the operation time out if was set by the caller
 if(nTimeout > 0)
- { 
+ {
 // 0 makes us use the default defined value
 pHTTPSession->HttpCounters.nActionTimeout = HTTP_TIMEOUT(nTimeout);
- 
+
 }
- 
+
 // Reset the incoming headers
 if((nRetCode = HTTPIntrnSessionReset(pHTTPSession,FALSE)) != HTTP_CLIENT_SUCCESS)
 {
 break;
 }
- 
+
 // Get the server response
 if((nRetCode = HTTPIntrnGetRemoteHeaders(pHTTPSession)) != HTTP_CLIENT_SUCCESS)
 {
 break;
 }
- 
+
 // Set the session state
 pHTTPSession->HttpState = pHTTPSession->HttpState | HTTP_CLIENT_STATE_HEADERS_RECIVED;
- 
+
 // Parse the response headers
 if((nRetCode = HTTPIntrnHeadersParse(pHTTPSession)) != HTTP_CLIENT_SUCCESS)
 {
 break;
 }
- 
+
 // Set the session state
 pHTTPSession->HttpState = pHTTPSession->HttpState | HTTP_CLIENT_STATE_HEADERS_PARSED;
- 
+
 // Set the session stage upon seccess
 if(pHTTPSession->HttpHeadersInfo.nHTTPStatus == HTTP_STATUS_OK)
 {
@@ -3578,7 +3578,7 @@
 {
 nCount++;
 }
- 
+
 #ifdef _HTTP_DEBUGGING_
 if(pHTTPSession->pDebug)
 {
@@ -3588,9 +3588,9 @@
 }
 }
 #endif
- 
+
 }while(nCount < 1);
- 
+
 return nRetCode;
 }
 
@@ -3601,16 +3601,16 @@
 // Gets : void
 // Returns : System ticks
 // Last updated : 01/09/200515/05/2005
-// Author Name	: Eitan Michaelson
-// Notes	 : Assuming 1000 ticks per sec, should be implemented by the OS
+// Author Name : Eitan Michaelson
+// Notes : Assuming 1000 ticks per sec, should be implemented by the OS
 //
 ///////////////////////////////////////////////////////////////////////////////
 
 static UINT32 HTTPIntrnSessionGetUpTime(VOID)
 {
- 
+
 return GetUpTime();
- 
+
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -3625,15 +3625,15 @@
 
 static BOOL HTTPIntrnSessionEvalTimeout(P_HTTP_SESSION pHTTPSession)
 {
- 
+
 UINT32 nElapsedTime; // Integer for calculating the elapsed time
- 
+
 // Validate the session pointer
 if(!pHTTPSession)
 {
 return HTTP_CLIENT_ERROR_INVALID_HANDLE;
- } 
- 
+ }
+
 // Calculate the elapsed time since the last call
 nElapsedTime = HTTPIntrnSessionGetUpTime() - pHTTPSession->HttpCounters.nActionStartTime;
 // If the elapsed time is greater then the time out value we should return true
@@ -3641,6 +3641,6 @@
 {
 return TRUE;
 }
- 
+
 return FALSE;
 }

libzen_0.4.22.tar.bz2/Source/ZenLib/HTTP_Client/HTTPClient.h -> libzen_0.4.28.tar.bz2/Source/ZenLib/HTTP_Client/HTTPClient.h Changed

@@ -5,8 +5,8 @@
 #include "HTTPClientWrapper.h"
 #include "HTTPClientCommon.h"
 
-#ifdef __cplusplus 
-extern "C" { 
+#ifdef __cplusplus
+extern "C" {
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -20,7 +20,7 @@
 #endif
 
 // Debug hook
- // #define _HTTP_DEBUGGING_ // Simply dumps more debugging data to the console 
+ // #define _HTTP_DEBUGGING_ // Simply dumps more debugging data to the console
 
 // API Version
 #define HTTP_CLIENT_VERSION_MINOR 0
@@ -53,7 +53,7 @@
 #define HTTP_CLIENT_DEFAULT_TIMEOUT 30 // Default timeout in seconds
 #define HTTP_CLIENT_DEFAULT_KEEP_ALIVE 30 // Default Keep-alive value in seconds
 #define HTTP_CLIENT_DEFAULT_DIGEST_AUTH "MD5" // This is for bypassing a known bug in AMT05..
-#define HTTP_CLIENT_DEFAULT_PROXY_AUTH 1 // Basic 
+#define HTTP_CLIENT_DEFAULT_PROXY_AUTH 1 // Basic
 
 #define HTTP_CLIENT_CRLF "\r\n" // End of line macro
 #define HTTP_CLIENT_CRLFX2 "\r\n\r\n" // Double End of line macro
@@ -77,7 +77,7 @@
 #define HTTP_STATUS_CONTINUE 100 // Page continue message
 
 
- // MIN AMX macro 
+ // MIN AMX macro
 #define MIN(a,b) (((a) < (b)) ? (a) : (b))
 #define MAX(a,b) (((a) > (b)) ? (a) : (b))
 // HTTP timeout macro for selecting the default value if the caller passed 0 (no timeout) to the function
@@ -99,7 +99,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
- // Generic parameter structure contains a pointer to the buffer and its length 
+ // Generic parameter structure contains a pointer to the buffer and its length
 
 typedef struct _HTTP_PARAM
 {
@@ -114,18 +114,18 @@
 {
 
 fd_set FDRead; // socket read event
- fd_set FDWrite; // socket write event 
+ fd_set FDWrite; // socket write event
 fd_set FDError; // socket error event
 INT32 HttpSocket; // The underling socket
 UINT32 HttpStartTime; // Time stamp for the session
 UINT32 HttpClientPort; // For client side binding
- BOOL				TlsNego; // TLS negotiation flag
+ BOOL TlsNego; // TLS negotiation flag
 
 } HTTP_CONNECTION;
 
 // Request URL
 typedef struct _HTTP_URL
- { 
+ {
 
 HTTP_PARAM UrlBsee; // a pointer and length to the "http" section of the URL
 HTTP_PARAM UrlHost; // a pointer and length to the host section of the URL
@@ -137,7 +137,7 @@
 }HTTP_URL;
 // HTTP headers (incoming and outgoing)
 typedef struct _HTTP_HEADERS
- { 
+ {
 
 HTTP_PARAM HeadersBuffer; // a pointer and length of the complete Headers (in\out) buffer
 HTTP_PARAM HeadersOut; // a pointer and length of the outgoing HTTP headers
@@ -167,7 +167,7 @@
 
 // Authentication parameters that ware extracted from the incoming headers
 typedef struct _HTTP_AUTH_HEADER
- { 
+ {
 
 HTTP_PARAM AuthHeader; // the pointer and length of the authentication header
 UINT32 HTTP_AUTH_SCHEMA; // Its schema (could be any of the supported)
@@ -198,7 +198,7 @@
 }HTTP_CREDENTIALS;
 // HTTP Counters
 typedef struct _HTTP_COUNTERS
- { 
+ {
 
 UINT32 nRecivedHeaderLength; // Bytes count of the incoming header
 UINT32 nRecivedBodyLength; // Bytes count of the incoming body length
@@ -221,7 +221,7 @@
 HTTP_HEADERS_INFO HttpHeadersInfo;
 HTTP_AUTH_HEADER HttpAuthHeader;
 HTTP_PROXY HttpProxy;
- HTTP_CREDENTIALS HttpCredentials; 
+ HTTP_CREDENTIALS HttpCredentials;
 HTTP_CONNECTION HttpConnection;
 HTTP_COUNTERS HttpCounters;
 UINT32 HttpState;
@@ -232,7 +232,7 @@
 } HTTP_SESSION, *P_HTTP_SESSION;
 
 
- // HTTP Type Definitions 
+ // HTTP Type Definitions
 typedef UINT32 HTTP_SESSION_HANDLE;
 typedef UINT32 HTTP_CLIENT_SESSION_FLAGS;

libzen_0.4.22.tar.bz2/Source/ZenLib/HTTP_Client/HTTPClientAuth.c -> libzen_0.4.28.tar.bz2/Source/ZenLib/HTTP_Client/HTTPClientAuth.c Changed

@@ -1,11 +1,11 @@
 
 ///////////////////////////////////////////////////////////////////////////////
-// Module Name: 
-// HTTPClientAuth.c 
-// 
-// Abstract: Handle Digest, MD5 and 64 Bit Encoding 
-// 
-// Platform: Any that supports standard C calls 
+// Module Name:
+// HTTPClientAuth.c
+//
+// Abstract: Handle Digest, MD5 and 64 Bit Encoding
+//
+// Platform: Any that supports standard C calls
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "HTTPClientAuth.h"
@@ -14,16 +14,16 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
 // Function : HTTPBase64Encoder
-// Purpose : Converts a given string into a base64 encoded buffer. 
+// Purpose : Converts a given string into a base64 encoded buffer.
 // Last updated : 01/09/200515/05/2005
-// Author Name	: Eitan Michaelson
-// Notes	 : 
+// Author Name : Eitan Michaelson
+// Notes :
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 void HTTPBase64Encoder(unsigned char *out, const unsigned char *in, int inlen)
-// OUT out A pointer to a char to hold the converted string 
-// IN in String to convert 
-// IN inlen Length of the string to be converted 
+// OUT out A pointer to a char to hold the converted string
+// IN in String to convert
+// IN inlen Length of the string to be converted
 
 {
 for (; inlen >= 3; inlen -= 3)
@@ -55,15 +55,15 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
 // Function : HTTPBase64Decoder
-// Purpose : Converts a given base64 string into a bytes buffer. 
+// Purpose : Converts a given base64 string into a bytes buffer.
 // Last updated : 01/09/200515/05/2005
-// Author Name	: Eitan Michaelson
-// Notes	 : 
+// Author Name : Eitan Michaelson
+// Notes :
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 int HTTPBase64Decoder(char *out, const char *in)
-{ // OUT out Where to save the converted string 
- // IN in String to convert 
+{ // OUT out Where to save the converted string
+ // IN in String to convert
 
 int len = 0;
 register unsigned char digit1, digit2, digit3, digit4;
@@ -110,8 +110,8 @@
 // Purpose : The following code implements the calculations of H(A1), H(A2),
 // request-digest and response-digest
 // Last updated : 01/09/200515/05/2005
-// Author Name	: Public Domain\RFC2617
-// Notes	 : Digest Access Authentication
+// Author Name : Public Domain\RFC2617
+// Notes : Digest Access Authentication
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -119,11 +119,11 @@
 // Function : GenerateCNonce
 // Purpose : Generates a 32 byte random hexadecimal string such as "4f6ba982..."
 // Last updated : 15/05/2005
-// Author Name	: Eitan Michaelson
-// Notes	 : 
+// Author Name : Eitan Michaelson
+// Notes :
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void HTTPDigestGenerateCNonce(char *outbuff) 
+void HTTPDigestGenerateCNonce(char *outbuff)
 {
 int i,num;
 InitRandomeNumber();
@@ -131,7 +131,7 @@
 num = GetRandomeNumber();
 switch(num) {
 case 0: case 1: case 2: case 3: case 4: case 5:
- case 6: case 7: case 8: case 9: 
+ case 6: case 7: case 8: case 9:
 outbuffi = '0' + num;
 break;
 case 10: case 11: case 12: case 13: case 14: case 15:
@@ -149,8 +149,8 @@
 // Function : DigestCvtHex
 // Purpose : CConvert to HEX
 // Last updated : 15/05/2005
-// Author Name	: Public Domain\RFC2617
-// Notes	 : 
+// Author Name : Public Domain\RFC2617
+// Notes :
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
@@ -179,8 +179,8 @@
 // Function : DigestCalcHA1
 // Purpose : Calculate H(A1) as per spec
 // Last updated : 15/05/2005
-// Author Name	: Public Domain\RFC2617
-// Notes	 : 
+// Author Name : Public Domain\RFC2617
+// Notes :
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 void HTTPDigestCalcHA1(
@@ -231,23 +231,23 @@
 // Function : DigestCalcResponse
 // Purpose : Calculate request-digest/response-digest as per HTTP Digest spec
 // Last updated : 15/05/2005
-// Author Name	: Public Domain\RFC2617
-// Notes	 : 
+// Author Name : Public Domain\RFC2617
+// Notes :
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 void HTTPDigestCalcResponse(
- IN HASHHEX HA1, // H(A1) 
- IN char * pszNonce, // nonce from server 
+ IN HASHHEX HA1, // H(A1)
+ IN char * pszNonce, // nonce from server
 IN int nNonceLength, // Length of nonce
- IN char * pszNonceCount, // 8 hex digits 
+ IN char * pszNonceCount, // 8 hex digits
 IN char * pszCNonce, // client nonce */
- IN char * pszQop, // qop-value: "", "auth", "auth-int" 
+ IN char * pszQop, // qop-value: "", "auth", "auth-int"
 IN int nQopLength, // qop param length
- IN char * pszMethod, // method from the request 
+ IN char * pszMethod, // method from the request
 IN char * pszDigestUri, // requested URL
 IN int nDigestUriLebgth, // Uri Length
- IN HASHHEX HEntity, // H(entity body) if qop="auth-int" 
- OUT HASHHEX Response // request-digest or response-digest 
+ IN HASHHEX HEntity, // H(entity body) if qop="auth-int"
+ OUT HASHHEX Response // request-digest or response-digest
 )
 {
 MD5_CTX Md5Ctx;
@@ -260,7 +260,7 @@
 HTTPMD5Update(&Md5Ctx, (const unsigned char *)pszMethod, strlen(pszMethod));
 HTTPMD5Update(&Md5Ctx, (const unsigned char *)":", 1);
 HTTPMD5Update(&Md5Ctx, (const unsigned char *)pszDigestUri, nDigestUriLebgth);
- if (stricmp(pszQop, "auth-int") == 0) 
+ if (stricmp(pszQop, "auth-int") == 0)
 {
 
 HTTPMD5Update(&Md5Ctx, (const unsigned char *)":", 1);
@@ -275,7 +275,7 @@
 HTTPMD5Update(&Md5Ctx, (const unsigned char *)":", 1);
 HTTPMD5Update(&Md5Ctx, (const unsigned char *)pszNonce, nNonceLength);
 HTTPMD5Update(&Md5Ctx, (const unsigned char *)":", 1);
- if (*pszQop) 
+ if (*pszQop)
 {
 
 HTTPMD5Update(&Md5Ctx, (const unsigned char *)pszNonceCount, strlen(pszNonceCount));
@@ -305,12 +305,12 @@
 // needed on buffers full of bytes, and then call MD5Final, which
 // will fill a supplied 16-byte array with the digest.
 // Last updated : 15/05/2005
-// Author Name	: Public Domain
+// Author Name : Public Domain
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef HIGHFIRST
-#define HTTPMD5ByteReverse(buf, len)	/* Nothing */
+#define HTTPMD5ByteReverse(buf, len) /* Nothing */
 #else
 void HTTPMD5ByteReverse(unsigned char *buf, unsigned longs);
 #ifndef ASM_MD5
@@ -319,11 +319,11 @@
 //
 // Function : ByteReverse
 // Purpose : Little\Big Endian support
-// Gets : 
-// Returns : 
+// Gets :
+// Returns :
 // Last updated : 15/05/2005
-// Author Name	: Public Domain
-// Notes	 : this code is harmless on little-endian machines.
+// Author Name : Public Domain
+// Notes : this code is harmless on little-endian machines.
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 void HTTPMD5ByteReverse(unsigned char *buf, unsigned longs)
@@ -345,10 +345,10 @@
 // Function : MD5Init
 // Purpose : Initialize the MD5Context structure
 // Gets : MD5Context structure
-// Returns : 
+// Returns :
 // Last updated : 15/05/2005
-// Author Name	: Public Domain
-// Notes	 : Start MD5 accumulation. Set bit count to 0 and buffer to mysterious
+// Author Name : Public Domain
+// Notes : Start MD5 accumulation. Set bit count to 0 and buffer to mysterious
 // initialization constants.
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -369,26 +369,26 @@
 // Function : MD5Update
 // Purpose : Update the MD5Context structure with the target byte array
 // Gets : MD5Context structure, buffer and length
-// Returns : 
+// Returns :
 // Last updated : 15/05/2005
-// Author Name	: Public Domain
-// Notes	 : Update context to reflect the concatenation of another buffer full of bytes.
+// Author Name : Public Domain
+// Notes : Update context to reflect the concatenation of another buffer full of bytes.
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 void HTTPMD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len)
 {
 uint32 t;
 
- // Update bitcount 
+ // Update bitcount
 
 t = ctx->bits0;
 if ((ctx->bits0 = t + ((uint32) len << 3)) < t)
- ctx->bits1++;		// Carry from low to high 
+ ctx->bits1++; // Carry from low to high
 ctx->bits1 += len >> 29;
 
- t = (t >> 3) & 0x3f;	// Bytes already in shsInfo->data 
+ t = (t >> 3) & 0x3f; // Bytes already in shsInfo->data
 
- // Handle any leading odd-sized chunks 
+ // Handle any leading odd-sized chunks
 
 if (t) {
 unsigned char *p = (unsigned char *) ctx->in + t;
@@ -404,7 +404,7 @@
 buf += t;
 len -= t;
 }
- // Process data in 64-byte chunks 
+ // Process data in 64-byte chunks
 
 while (len >= 64) {
 memcpy(ctx->in, buf, 64);
@@ -414,7 +414,7 @@
 len -= 64;
 }
 
- // Handle any remaining bytes of data. 
+ // Handle any remaining bytes of data.
 
 memcpy(ctx->in, buf, len);
 }
@@ -424,10 +424,10 @@
 // Function : MD5Final
 // Purpose : Finalize.
 // Gets : Output digest structure, MD5Context structure
-// Returns : 
+// Returns :
 // Last updated : 15/05/2005
-// Author Name	: Public Domain
-// Notes	 : Final wrapup - pad to 64-byte boundary with the bit pattern
+// Author Name : Public Domain
+// Notes : Final wrapup - pad to 64-byte boundary with the bit pattern
 // 1 0* (64-bit count of bits processed, MSB-first).
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/
 
@@ -437,47 +437,47 @@
 unsigned count;
 unsigned char *p;
 
- // Compute number of bytes mod 64 
+ // Compute number of bytes mod 64
 count = (ctx->bits0 >> 3) & 0x3F;
 
 // Set the first char of padding to 0x80. This is safe since there is
- // always at least one byte free 
+ // always at least one byte free
 p = ctx->in + count;
 *p++ = 0x80;
 
- // Bytes of padding needed to make 64 bytes 
+ // Bytes of padding needed to make 64 bytes
 count = 64 - 1 - count;
 
 // Pad out to 56 mod 64 */
 if (count < 8) {
- // Two lots of padding: Pad the first block to 64 bytes 
+ // Two lots of padding: Pad the first block to 64 bytes
 memset(p, 0, count);
 HTTPMD5ByteReverse(ctx->in, 16);
 HTTPMD5Transform(ctx->buf, (uint32 *) ctx->in);
 
- // Now fill the next block with 56 bytes 
+ // Now fill the next block with 56 bytes
 memset(ctx->in, 0, 56);
 } else {
- // Pad block to 56 bytes 
+ // Pad block to 56 bytes
 memset(p, 0, count - 8);
 }
 HTTPMD5ByteReverse(ctx->in, 14);
 
- // Append length in bits and transform 
+ // Append length in bits and transform
 ((uint32 *) ctx->in)14 = ctx->bits0;
 ((uint32 *) ctx->in)15 = ctx->bits1;
 
 HTTPMD5Transform(ctx->buf, (uint32 *) ctx->in);
 HTTPMD5ByteReverse((unsigned char *) ctx->buf, 4);
 memcpy(digest, ctx->buf, 16);
- memset(ctx, 0, sizeof(ctx));	// In case it's sensitive 
+ memset(ctx, 0, sizeof(ctx)); // In case it's sensitive
 }
 
 #ifndef ASM_MD5
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
-// Function : 
+// Function :
 // Purpose : The four core functions - F1 is optimized somewhat
 // Last updated : 15/05/2005
 //
@@ -488,7 +488,7 @@
 #define F3(x, y, z) (x ^ y ^ z)
 #define F4(x, y, z) (y ^ (x | ~z))
 
-// This is the central step in the MD5 algorithm. 
+// This is the central step in the MD5 algorithm.
 #ifdef __PUREC__
 #define MD5STEP(f, w, x, y, z, data, s) \
 ( w += f /*(x, y, z)*/ + data, w = w<<s | w>>(32-s), w += x )
@@ -504,7 +504,7 @@
 // reflect the addition of 16 longwords of new data. MD5Update blocks
 // the data and converts bytes into longwords for this routine.
 // Last updated : 15/05/2005
-// Author Name	: Public Domain
+// Author Name : Public Domain
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
@@ -517,7 +517,7 @@
 c = buf2;
 d = buf3;
 
-#ifdef __PUREC__	// PureC Weirdness... (GG) 
+#ifdef __PUREC__ // PureC Weirdness... (GG)
 MD5STEP(F1(b,c,d), a, b, c, d, in0 + 0xd76aa478L, 7);
 MD5STEP(F1(a,b,c), d, a, b, c, in1 + 0xe8c7b756L, 12);
 MD5STEP(F1(d,a,b), c, d, a, b, in2 + 0x242070dbL, 17);

libzen_0.4.22.tar.bz2/Source/ZenLib/HTTP_Client/HTTPClientAuth.h -> libzen_0.4.28.tar.bz2/Source/ZenLib/HTTP_Client/HTTPClientAuth.h Changed

@@ -14,7 +14,7 @@
 typedef char HASHHEXHASHHEXLEN+1;
 typedef unsigned long uint32;
 
-// Base 64 Related 
+// Base 64 Related
 #define DECODE64(c)  (isascii(c) ? base64valc : BAD)
 #define BAD     -1
 
@@ -40,7 +40,7 @@
 // Generates a 32 byte random hexadecimal string such as "4f6ba982..."
 void HTTPDigestGenerateCNonce(char *outbuff);
 
-// Calculate H(A1) as per HTTP Digest spec 
+// Calculate H(A1) as per HTTP Digest spec
 void HTTPDigestCalcHA1(
                    IN int    nAlg,     /* 0 = MD5, 1 = MD5-Sess */
                    IN char * pszUserName,
@@ -53,24 +53,24 @@
                    OUT HASHHEX SessionKey
                    );
 
-// Calculate request-digest/response-digest as per HTTP Digest spec 
+// Calculate request-digest/response-digest as per HTTP Digest spec
 void HTTPDigestCalcResponse(
-                        IN HASHHEX HA1,             // H(A1) 
-                        IN char * pszNonce,         // nonce from server 
+                        IN HASHHEX HA1,             // H(A1)
+                        IN char * pszNonce,         // nonce from server
                         IN int    nNonceLength,     // Length of nonce
-                        IN char * pszNonceCount,    // 8 hex digits 
-                        IN char * pszCNonce,        // client nonce 
-                        IN char * pszQop,           // qop-value: "", "auth", "auth-int" 
+                        IN char * pszNonceCount,    // 8 hex digits
+                        IN char * pszCNonce,        // client nonce
+                        IN char * pszQop,           // qop-value: "", "auth", "auth-int"
                         IN int    nQopLength,       // qop param length
-                        IN char * pszMethod,        // method from the request 
-                        IN char * pszDigestUri,     // requested URL 
+                        IN char * pszMethod,        // method from the request
+                        IN char * pszDigestUri,     // requested URL
                         IN int    nDigestUriLebgth, // Uri Length
                         IN HASHHEX HEntity,         // H(entity body) if qop="auth-int"
-                        OUT HASHHEX Response        // request-digest or response-digest 
+                        OUT HASHHEX Response        // request-digest or response-digest
                         );
 
-// MD5 structures and functions 
-struct MD5Context 
+// MD5 structures and functions
+struct MD5Context
 {
     uint32 buf4;
     uint32 bits2;
@@ -86,5 +86,5 @@
 // This is needed to make RSAREF happy on some MS-DOS compilers.
 typedef struct MD5Context MD5_CTX;
 
-#endif 
+#endif

libzen_0.4.22.tar.bz2/Source/ZenLib/HTTP_Client/HTTPClientCommon.h -> libzen_0.4.28.tar.bz2/Source/ZenLib/HTTP_Client/HTTPClientCommon.h Changed

@@ -1,20 +1,20 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 //
-// Module Name:                                                                
-//   CmsiHTTPClientCommon.h                                                    
-//                                                                             
-// Abstract: Coomon structs and types for the HTTP protocol API                
-// Author:	Eitan Michaelso                                                     
-// Version:  1.0                                                               
-//                                                                             
+// Module Name:
+//   CmsiHTTPClientCommon.h
+//
+// Abstract: Coomon structs and types for the HTTP protocol API
+// Author:  Eitan Michaelso
+// Version:  1.0
+//
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _HTTPCLIENT_PROTOCOL_H_
 #define _HTTPCLIENT_PROTOCOL_H_
 
-#ifdef __cplusplus 
-extern "C" { 
+#ifdef __cplusplus
+extern "C" {
 #endif
 
     // Global default sizes
@@ -24,7 +24,7 @@
 #define HTTP_CLIENT_FLAG_KEEP_ALIVE         0x00000001 // Set the keep alive header
 #define HTTP_CLIENT_FLAG_SEND_CHUNKED       0x00000002 // The outgoing should chunked
 #define HTTP_CLIENT_FLAG_NO_CACHE           0x00000004 // Set the no cache header
-#define HTTP_CLIENT_FLAG_ASYNC              0x00000008 // Currently not implemented 
+#define HTTP_CLIENT_FLAG_ASYNC              0x00000008 // Currently not implemented
 
     // HTTP status internal flags
 #define HTTP_CLIENT_STATE_PRE_INIT          0x00000000  // Starting stage
@@ -69,8 +69,8 @@
 #define HTTP_CLIENT_ERROR_AUTH_MISMATCH     26 // The selected authentication schema does not match the server response
 #define HTTP_CLIENT_ERROR_NO_DIGEST_TOKEN   27 // an element was missing while parsing the digest authentication challenge
 #define HTTP_CLIENT_ERROR_NO_DIGEST_ALG     28 // Digest algorithem could be MD5 or MD5-sess other types are not supported
-#define HTTP_CLIENT_ERROR_SOCKET_BIND		  29 // Binding error
-#define HTTP_CLIENT_ERROR_TLS_NEGO			  30 // Tls negotiation error
+#define HTTP_CLIENT_ERROR_SOCKET_BIND         29 // Binding error
+#define HTTP_CLIENT_ERROR_TLS_NEGO            30 // Tls negotiation error
 #define HTTP_CLIENT_ERROR_NOT_IMPLEMENTED   64 // Feature is not (yet) implemented
 #define HTTP_CLIENT_EOS                     1000        // HTTP end of stream message
 
@@ -81,7 +81,7 @@
     //
     ///////////////////////////////////////////////////////////////////////////////
 
-    // HTTP Supported authentication methods 
+    // HTTP Supported authentication methods
     typedef enum _HTTP_AUTH_SCHEMA
     {
         AuthSchemaNone      = 0,
@@ -107,14 +107,14 @@
     typedef struct _HTTP_CLIENT
     {
         UINT32        HTTPStatusCode;                 // HTTP Status code (200 OK)
-        UINT32		    RequestBodyLengthSent;          // Total bytes sent (body only)
-        UINT32		    ResponseBodyLengthReceived;     // Total bytes received (body only)
-        UINT32		    TotalResponseBodyLength;        // as extracted from the content-length" header
+        UINT32          RequestBodyLengthSent;          // Total bytes sent (body only)
+        UINT32          ResponseBodyLengthReceived;     // Total bytes received (body only)
+        UINT32          TotalResponseBodyLength;        // as extracted from the content-length" header
         UINT32        HttpState;
     } HTTP_CLIENT;
 
 #ifdef __cplusplus
 }
 #endif
-  
+
 #endif // _HTTPCLIENT_PROTOCOL_H_

libzen_0.4.22.tar.bz2/Source/ZenLib/HTTP_Client/HTTPClientString.c -> libzen_0.4.28.tar.bz2/Source/ZenLib/HTTP_Client/HTTPClientString.c Changed

@@ -1,12 +1,12 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 //
-// Module Name: 
-// HTTPClientString.c 
-// 
-// Abstract: Helper function (string parsing related) for HTTPClient.c module 
-// 
-// Platform: Any that supports standard C calls 
+// Module Name:
+// HTTPClientString.c
+//
+// Abstract: Helper function (string parsing related) for HTTPClient.c module
+//
+// Platform: Any that supports standard C calls
 //
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -88,9 +88,9 @@
 //
 // Function : HTTPStrExtract
 // Purpose : Extract a string by placing null in the offset parameter
-// Returns : a pointer to the new string 
+// Returns : a pointer to the new string
 // Last updated : 01/09/2005
-// 
+//
 ///////////////////////////////////////////////////////////////////////////////
 
 CHAR HTTPStrExtract(CHAR *pParam, // IN a pointer to the input parameter
@@ -123,17 +123,17 @@
 ///////////////////////////////////////////////////////////////////////////////
 //
 // Function : HTTPStrSearch
-// Purpose : Search a string within another and return its pointer and a length 
+// Purpose : Search a string within another and return its pointer and a length
 // Returns : BOOL - TRUE on success
 // Last updated : 01/09/2005
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-BOOL HTTPStrSearch(CHAR *pSrc, // IN The source string 
+BOOL HTTPStrSearch(CHAR *pSrc, // IN The source string
 CHAR *pSearched, // IN Parameter to search for
 UINT32 nOffset, // IN Offset from the source string start position
 UINT32 nScope, // IN Length in bytes we should search in
- HTTP_PARAM *HttpParam) // IN OUT The Pointer\Length value that will be returned on success 
+ HTTP_PARAM *HttpParam) // IN OUT The Pointer\Length value that will be returned on success
 {
 
 CHAR *pSrcStart;
@@ -193,7 +193,7 @@
 const char *ptr2;
 UINT32 iLength = 0;
 
- while(1) 
+ while(1)
 {
 if(iLength >= nSrcLength)
 {
@@ -201,18 +201,18 @@
 }
 ptr = strchr(pSrc,toupper(*pFind));
 ptr2 = strchr(pSrc,tolower(*pFind));
- if (!ptr) 
+ if (!ptr)
 {
- ptr = ptr2; 
+ ptr = ptr2;
 }
- if (!ptr) 
+ if (!ptr)
 {
 break;
 }
 if (ptr2 && (ptr2 < ptr)) {
 ptr = ptr2;
 }
- if (!strnicmp(ptr,pFind,strlen(pFind))) 
+ if (!strnicmp(ptr,pFind,strlen(pFind)))
 {
 return (char *) ptr;
 }
@@ -220,14 +220,14 @@
 iLength++;
 }
 return 0;
-} 
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 // Function : HTTPStrCaseStr
-// Purpose : 
-// Gets : 
-// Returns : 
+// Purpose :
+// Gets :
+// Returns :
 // Last updated : 01/09/2005
 //
 ///////////////////////////////////////////////////////////////////////////////
@@ -295,9 +295,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 //
 // Function : HTTPStrGetDigestToken
-// Purpose : 
-// Gets : 
-// Returns : 
+// Purpose :
+// Gets :
+// Returns :
 // Last updated : 01/09/2005
 //
 ///////////////////////////////////////////////////////////////////////////////
@@ -368,16 +368,16 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 
-UINT32 HTTPStrHToL (CHAR * s) 
+UINT32 HTTPStrHToL (CHAR * s)
 {
 UINT32 i , nn, digit;
 UINT32 n ;
 
 n = i = nn = 0;
- do 
+ do
 {
 if ( isalnum(si) ) {
- si = toupper(si) ; 
+ si = toupper(si) ;
 if (si == 'X') nn=n=0; else {
 digit = (isalpha(si) ? (si - 'A' + 10) : si - '0') ;
 if ( digit > 15 ) digit = 15;
@@ -393,8 +393,8 @@
 
 /////////////////////////////////////////////////////////////////////////////////
 // Function : HTTPStrLToH
-// Purpose : Convert a long to hex string 0 to "00" 
-// Gets : 
+// Purpose : Convert a long to hex string 0 to "00"
+// Gets :
 // Last updated : 15/05/2005
 //
 ///////////////////////////////////////////////////////////////////////////////
@@ -409,7 +409,7 @@
 dest0 = '0';
 dest1 = 0;
 }
- else 
+ else
 {
 for(i = 28; ((nSrc >> i) && 0xf) == 0; i -= 4);
 for(; i >= 0; i -= 4) {

libzen_0.4.22.tar.bz2/Source/ZenLib/HTTP_Client/HTTPClientString.h -> libzen_0.4.28.tar.bz2/Source/ZenLib/HTTP_Client/HTTPClientString.h Changed

@@ -3,7 +3,7 @@
 #define _HTTP_CLIENT_STRING
 
 #include "HTTPClientWrapper.h" // Cross platform support
-#include "HTTPClient.h" 
+#include "HTTPClient.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 //
@@ -15,9 +15,9 @@
 BOOL                    HTTPStrInsensitiveCompare   (CHAR *pSrc, CHAR* pDest, UINT32 nLength);
 BOOL                    HTTPStrSearch               (CHAR *pSrc, CHAR *pSearched, UINT32 nOffset, UINT32 nScope,HTTP_PARAM *HttpParam);
 CHAR                    HTTPStrExtract              (CHAR *pParam,UINT32 nOffset,CHAR Restore);
-CHAR*                   HTTPStrCaseStr              (CHAR *pSrc, UINT32 nSrcLength, CHAR *pFind); 
+CHAR*                   HTTPStrCaseStr              (CHAR *pSrc, UINT32 nSrcLength, CHAR *pFind);
 CHAR*                   HTTPStrGetToken             (CHAR *pSrc, UINT32 nSrcLength, CHAR *pDest, UINT32 *nDestLength);
 UINT32                  HTTPStrGetDigestToken       (HTTP_PARAM pParamSrc, CHAR *pSearched, HTTP_PARAM *pParamDest);
-UINT32                  HTTPStrHToL                 (CHAR * s); 
-CHAR*                   HTTPStrLToH                 (CHAR * dest,UINT32 nSrc);        
+UINT32                  HTTPStrHToL                 (CHAR * s);
+CHAR*                   HTTPStrLToH                 (CHAR * dest,UINT32 nSrc);
 #endif

libzen_0.4.22.tar.bz2/Source/ZenLib/HTTP_Client/HTTPClientWrapper.c -> libzen_0.4.28.tar.bz2/Source/ZenLib/HTTP_Client/HTTPClientWrapper.c Changed

@@ -1,4 +1,4 @@
- 
+
 #include "HTTPClientWrapper.h"
 
 
@@ -6,8 +6,8 @@
 //
 // Section : Stdc: HTTPWrapperIsAscii
 // Last updated : 15/05/2005
-// Author Name	: Eitan Michaelson
-// Notes	 : Same as stdc: isascii
+// Author Name : Eitan Michaelson
+// Notes : Same as stdc: isascii
 //
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -20,8 +20,8 @@
 //
 // Section : Stdc: HTTPWrapperToUpper
 // Last updated : 15/05/2005
-// Author Name	: Eitan Michaelson
-// Notes	 : Convert character to uppercase.
+// Author Name : Eitan Michaelson
+// Notes : Convert character to uppercase.
 //
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -43,8 +43,8 @@
 //
 // Section : Stdc: HTTPWrapperToLower
 // Last updated : 13/06/2006
-// Author Name	 : Eitan Michaelson
-// Notes	 : Convert character to lowercase.
+// Author Name : Eitan Michaelson
+// Notes : Convert character to lowercase.
 //
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -67,8 +67,8 @@
 //
 // Section : Stdc: isalpha
 // Last updated : 15/05/2005
-// Author Name	: Eitan Michaelson
-// Notes	 : returns nonzero if c is a particular representation of an alphabetic character
+// Author Name : Eitan Michaelson
+// Notes : returns nonzero if c is a particular representation of an alphabetic character
 //
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -77,7 +77,7 @@
 
 if(HTTPWrapperIsAscii(c) > 0)
 {
- if( (c >= 97 && c <= 122) || (c >= 65 && c <= 90)) 
+ if( (c >= 97 && c <= 122) || (c >= 65 && c <= 90))
 {
 return c;
 }
@@ -89,8 +89,8 @@
 //
 // Section : Stdc: isalnum
 // Last updated : 15/05/2005
-// Author Name	: Eitan Michaelson
-// Notes	 : returns nonzero if c is a particular representation of an alphanumeric character
+// Author Name : Eitan Michaelson
+// Notes : returns nonzero if c is a particular representation of an alphanumeric character
 //
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -104,10 +104,10 @@
 return c;
 }
 
- if( c >= 48 && c <= 57) 
+ if( c >= 48 && c <= 57)
 {
 return c;
- } 
+ }
 
 }
 return 0;
@@ -118,8 +118,8 @@
 //
 // Section : HTTPWrapper_itoa
 // Last updated : 15/05/2005
-// Author Name	: Eitan Michaelson
-// Notes	 : same as stdc itoa() // hmm.. allmost the same
+// Author Name : Eitan Michaelson
+// Notes : same as stdc itoa() // hmm.. allmost the same
 //
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -144,13 +144,13 @@
 //
 // Section : HTTPWrapper_ShutDown
 // Last updated : 15/05/2005
-// Author Name	: Eitan Michaelson
-// Notes	 : Handles parameter changes in the socket shutdown() function in AMT
+// Author Name : Eitan Michaelson
+// Notes : Handles parameter changes in the socket shutdown() function in AMT
 //
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-int HTTPWrapperShutDown (int s,int how) 
+int HTTPWrapperShutDown (int s,int how)
 {
 return shutdown(s,how);
 }
@@ -159,8 +159,8 @@
 //
 // Section : HTTPWrapper_GetSocketError
 // Last updated : 15/05/2005
-// Author Name	: Eitan Michaelson
-// Notes	 : WSAGetLastError Wrapper (Win32 Specific)
+// Author Name : Eitan Michaelson
+// Notes : WSAGetLastError Wrapper (Win32 Specific)
 //
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -174,8 +174,8 @@
 //
 // Section : HTTPWrapper_GetHostByName
 // Last updated : 15/05/2005
-// Author Name	: Eitan Michaelson
-// Notes	 : gethostbyname for Win32 (supports the AMT edition of the function)
+// Author Name : Eitan Michaelson
+// Notes : gethostbyname for Win32 (supports the AMT edition of the function)
 //
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -188,13 +188,13 @@
 char Num4;
 int iHostType = 0; // 0 : numeric IP
 
- // Check if the name is an IP or host 
+ // Check if the name is an IP or host
 iLen = strlen(name);
 for(iPos = 0; iPos <= iLen;iPos++)
 {
 c = nameiPos;
 if((c >= 48 && c <= 57) || (c == '.') )
- { 
+ {
 // c is numeric or dot
 if(c != '.')
 {
@@ -236,18 +236,18 @@
 else
 {
 iHostType++;
- } 
+ }
 
 if(iHostType > 0)
 {
 
- HostEntry = gethostbyname(name); 
+ HostEntry = gethostbyname(name);
 if(HostEntry)
 {
 *(address) = *((u_long*)HostEntry->h_addr_list0);
 
 //*(address) = (unsigned long)HostEntry->h_addr_list0;
- return 1; // Error 
+ return 1; // Error
 }
 else
 {
@@ -269,8 +269,8 @@
 //
 // Section : HTTPWrapper_GetRandomeNumber
 // Last updated : 15/05/2005
-// Author Name	: Eitan Michaelson
-// Notes	 : GetRandom number for Win32 & AMT
+// Author Name : Eitan Michaelson
+// Notes : GetRandom number for Win32 & AMT
 //
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -290,8 +290,8 @@
 //
 // Section : HTTPWrapper_GetRTC
 // Last updated : 15/05/2005
-// Author Name	: Eitan Michaelson
-// Notes	 : Get uptime under Win32 & AMT
+// Author Name : Eitan Michaelson
+// Notes : Get uptime under Win32 & AMT
 //
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -308,8 +308,8 @@
 //
 // Section : TSL Wrapper
 // Last updated : 15/05/2005
-// Author Name	: Eitan Michaelson
-// Notes	 : HTTPWrapper_Sec_Connect
+// Author Name : Eitan Michaelson
+// Notes : HTTPWrapper_Sec_Connect
 //
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

libzen_0.4.22.tar.bz2/Source/ZenLib/HTTP_Client/HTTPClientWrapper.h -> libzen_0.4.28.tar.bz2/Source/ZenLib/HTTP_Client/HTTPClientWrapper.h Changed

@@ -32,7 +32,7 @@
 typedef int                          INT32;
 
 // Sockets (Winsock wrapper)
-#define                              HTTP_ECONNRESET     (WSAECONNRESET) 
+#define                              HTTP_ECONNRESET     (WSAECONNRESET)
 #define                              HTTP_EINPROGRESS    (WSAEINPROGRESS)
 #define                              HTTP_EWOULDBLOCK    (WSAEWOULDBLOCK)
 #endif
@@ -45,8 +45,8 @@
 // Last updated : 01/09/2005
 //
 ///////////////////////////////////////////////////////////////////////////////
-#ifdef __cplusplus 
-extern "C" { 
+#ifdef __cplusplus
+extern "C" {
 #endif
 
     // STDC Wrapper implimentation
@@ -61,7 +61,7 @@
     int                                 HTTPWrapperGetRandomeNumber     ();
     int                                 HTTPWrapperGetSocketError       (int s);
     unsigned long                       HTTPWrapperGetHostByName        (char *name,unsigned long *address);
-    int                                 HTTPWrapperShutDown             (int s,int in);  
+    int                                 HTTPWrapperShutDown             (int s,int in);
     // SSL Wrapper prototypes
     int                                 HTTPWrapperSSLConnect           (int s,const struct sockaddr *name,int namelen,char *hostname);
     int                                 HTTPWrapperSSLNegotiate         (int s,const struct sockaddr *name,int namelen,char *hostname);
@@ -72,12 +72,12 @@
     // Global wrapper Functions
 #define                             IToA                            HTTPWrapperItoa
 #define                             GetUpTime                       HTTPWrapperGetUpTime
-#define                             SocketGetErr                    HTTPWrapperGetSocketError 
+#define                             SocketGetErr                    HTTPWrapperGetSocketError
 #define                             HostByName                      HTTPWrapperGetHostByName
 #define                             InitRandomeNumber               HTTPWrapperInitRandomeNumber
 #define                             GetRandomeNumber                HTTPWrapperGetRandomeNumber
 
-#ifdef __cplusplus 
+#ifdef __cplusplus
 }
 #endif
 
@@ -102,7 +102,7 @@
 // Global socket structures and definitions
 #define                              HTTP_INVALID_SOCKET (-1)
 typedef struct sockaddr_in           HTTP_SOCKADDR_IN;
-typedef struct timeval               HTTP_TIMEVAL; 
+typedef struct timeval               HTTP_TIMEVAL;
 typedef struct hostent               HTTP_HOSTNET;
 typedef struct sockaddr              HTTP_SOCKADDR;
 typedef struct in_addr               HTTP_INADDR;

libzen_0.4.22.tar.bz2/Source/ZenLib/InfoMap.cpp -> libzen_0.4.28.tar.bz2/Source/ZenLib/InfoMap.cpp Changed

@@ -56,14 +56,14 @@
 : std::multimap<ZenLib::Ztring, ZenLib::ZtringList> ()
 {
 Separator0=EOL;
- Separator1=_T(";");
+ Separator1=__T(";");
 }
 
 InfoMap::InfoMap(const Ztring &Source)
 : std::multimap<ZenLib::Ztring, ZenLib::ZtringList> ()
 {
 Separator0=EOL;
- Separator1=_T(";");
+ Separator1=__T(";");
 Write(Source);
 }
 
@@ -71,7 +71,7 @@
 : std::multimap<ZenLib::Ztring, ZenLib::ZtringList> ()
 {
 Separator0=EOL;
- Separator1=_T(";");
+ Separator1=__T(";");
 Write(Source);
 }
 
@@ -80,7 +80,7 @@
 : std::multimap<ZenLib::Ztring, ZenLib::ZtringList> ()
 {
 Separator0=EOL;
- Separator1=_T(";");
+ Separator1=__T(";");
 Write(Ztring(S));
 }
 #endif
@@ -142,8 +142,8 @@
 
 while (Pos2_EOL!=(size_t)-1)
 {
- Pos2_EOL=NewInfoMap.find(_T('\n'), Pos1);
- Pos2_Separator=NewInfoMap.find(_T(';'), Pos1);
+ Pos2_EOL=NewInfoMap.find(__T('\n'), Pos1);
+ Pos2_Separator=NewInfoMap.find(__T(';'), Pos1);
 if (Pos2_Separator<Pos2_EOL)
 {
 ZtringList List; List.Write(NewInfoMap.substr(Pos1, Pos2_EOL-Pos1));

libzen_0.4.22.tar.bz2/Source/ZenLib/MemoryDebug.cpp -> libzen_0.4.28.tar.bz2/Source/ZenLib/MemoryDebug.cpp Changed

@@ -96,20 +96,20 @@
 << " | " << std::setw(7) << std::setfill(' ') << static_cast<int>(i->second.Size) << " bytes"
 << " | " << i->second.File.c_str() << " (" << i->second.Line << ")" << std::endl;
 */
- m_File.append(_T("-> 0x"));
+ m_File.append(__T("-> 0x"));
 m_File.append(Ztring::ToZtring((size_t)i->first, 16));
- m_File.append(_T(" | "));
+ m_File.append(__T(" | "));
 Ztring Temp;
 Temp.From_Number(static_cast<int>(i->second.Size));
 while(Temp.size()<7)
- Temp=_T(" ")+Temp;
+ Temp=__T(" ")+Temp;
 m_File.append(Temp);
- m_File.append(_T(" bytes"));
- m_File.append(_T(" | "));
+ m_File.append(__T(" bytes"));
+ m_File.append(__T(" | "));
 m_File.append(Ztring().From_Local(i->second.File.c_str()));
- m_File.append(_T(" ("));
+ m_File.append(__T(" ("));
 m_File.append(Ztring::ToZtring(i->second.Line));
- m_File.append(_T(")"));
+ m_File.append(__T(")"));
 m_File.append(EOL);
 }
 
@@ -122,11 +122,11 @@
 */
 m_File.append(EOL);
 m_File.append(EOL);
- m_File.append(_T("-- "));
+ m_File.append(__T("-- "));
 m_File.append(Ztring::ToZtring(static_cast<int>(m_Blocks.size())));
- m_File.append(_T(" non-released blocs, "));
+ m_File.append(__T(" non-released blocs, "));
 m_File.append(Ztring::ToZtring(static_cast<int>(TotalSize)));
- m_File.append(_T(" bytes --"));
+ m_File.append(__T(" bytes --"));
 m_File.append(EOL);
 
 std::string ToWrite=m_File.To_Local().c_str();

libzen_0.4.22.tar.bz2/Source/ZenLib/OS_Utils.cpp -> libzen_0.4.28.tar.bz2/Source/ZenLib/OS_Utils.cpp Changed

libzen_0.4.22.tar.bz2/Source/ZenLib/OS_Utils.h -> libzen_0.4.28.tar.bz2/Source/ZenLib/OS_Utils.h Changed

libzen_0.4.22.tar.bz2/Source/ZenLib/PreComp.cpp -> libzen_0.4.28.tar.bz2/Source/ZenLib/PreComp.cpp Changed

@@ -1,25 +1,23 @@
 // PreComp - PreComp file for ZenLib
-// Copyright (C) 2006-2011 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2011 MediaArea.net SARL, Info@MediaArea.net
 //
-// This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// any later version.
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
 //
-// This library 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 Lesser General Public License for more details.
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
 //
-// You should have received a copy of the GNU Lesser General Public License
-// along with this library. If not, see <http://www.gnu.org/licenses/>.
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgment in the product documentation would be
+// appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
 //
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//
-// Helpers for compilers (precompilation)
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
 #include "ZenLib/PreComp.h"

libzen_0.4.22.tar.bz2/Source/ZenLib/PreComp.h -> libzen_0.4.28.tar.bz2/Source/ZenLib/PreComp.h Changed

@@ -1,18 +1,17 @@
 // PreComp - PreComp file for ZenLib
 // Copyright (C) 2006-2011 MediaArea.net SARL, Info@MediaArea.net
 //
-// This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// any later version.
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
 //
-// This library 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 Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this library. If not, see <http://www.gnu.org/licenses/>.
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgment in the product documentation would be
+// appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libzen_0.4.22.tar.bz2/Source/ZenLib/Thread.cpp -> libzen_0.4.28.tar.bz2/Source/ZenLib/Thread.cpp Changed

libzen_0.4.22.tar.bz2/Source/ZenLib/Thread.h -> libzen_0.4.28.tar.bz2/Source/ZenLib/Thread.h Changed

libzen_0.4.22.tar.bz2/Source/ZenLib/Trace.h -> libzen_0.4.28.tar.bz2/Source/ZenLib/Trace.h Changed

libzen_0.4.22.tar.bz2/Source/ZenLib/Translation.cpp -> libzen_0.4.28.tar.bz2/Source/ZenLib/Translation.cpp Changed

@@ -52,20 +52,20 @@
 : std::map<ZenLib::Ztring, ZenLib::Ztring> ()
 {
 Separator0=EOL;
- Separator1=_T(";");
+ Separator1=__T(";");
 }
 
 Translation::Translation(const Ztring &Source)
 {
 Separator0=EOL;
- Separator1=_T(";");
+ Separator1=__T(";");
 Write(Source);
 }
 
 Translation::Translation(const Char *Source)
 {
 Separator0=EOL;
- Separator1=_T(";");
+ Separator1=__T(";");
 Write(Source);
 }
 
@@ -73,7 +73,7 @@
 Translation::Translation (const char* S)
 {
 Separator0=EOL;
- Separator1=_T(";");
+ Separator1=__T(";");
 Write(Ztring(S));
 }
 #endif
@@ -128,8 +128,8 @@
 
 while (Pos2_EOL!=(size_t)-1)
 {
- Pos2_EOL=NewLanguage.find(_T('\n'), Pos1);
- Pos2_Separator=NewLanguage.find(_T(';'), Pos1);
+ Pos2_EOL=NewLanguage.find(__T('\n'), Pos1);
+ Pos2_Separator=NewLanguage.find(__T(';'), Pos1);
 if (Pos2_Separator<Pos2_EOL)
 {
 operator(NewLanguage.substr(Pos1, Pos2_Separator-Pos1))=NewLanguage.substr(Pos2_Separator+1, Pos2_EOL-Pos2_Separator-1);

libzen_0.4.22.tar.bz2/Source/ZenLib/Utils.cpp -> libzen_0.4.28.tar.bz2/Source/ZenLib/Utils.cpp Changed

libzen_0.4.22.tar.bz2/Source/ZenLib/Ztring.cpp -> libzen_0.4.28.tar.bz2/Source/ZenLib/Ztring.cpp Changed

@@ -58,7 +58,6 @@
 #ifdef SS
 #undef SS //Solaris defines this in cstdlib
 #endif
-#include <ctime>
 #include <algorithm>
 #include <sstream>
 #include <iomanip>
@@ -72,21 +71,122 @@
 namespace ZenLib
 {
 
+int16u Ztring_ISO_8859_296=
+{
+ 0x00A0,
+ 0x0104,
+ 0x02D8,
+ 0x0141,
+ 0x00A4,
+ 0x013D,
+ 0x015A,
+ 0x00A7,
+ 0x00A8,
+ 0x0160,
+ 0x015E,
+ 0x0164,
+ 0x0179,
+ 0x00AD,
+ 0x017D,
+ 0x017B,
+ 0x00B0,
+ 0x0105,
+ 0x02DB,
+ 0x0142,
+ 0x00B4,
+ 0x013E,
+ 0x015B,
+ 0x02C7,
+ 0x00B8,
+ 0x0161,
+ 0x015F,
+ 0x0165,
+ 0x017A,
+ 0x02DD,
+ 0x017E,
+ 0x017C,
+ 0x0154,
+ 0x00C1,
+ 0x00C2,
+ 0x0102,
+ 0x00C4,
+ 0x0139,
+ 0x0106,
+ 0x00C7,
+ 0x010C,
+ 0x00C9,
+ 0x0118,
+ 0x00CB,
+ 0x011A,
+ 0x00CD,
+ 0x00CE,
+ 0x010E,
+ 0x0110,
+ 0x0143,
+ 0x0147,
+ 0x00D3,
+ 0x00D4,
+ 0x0150,
+ 0x00D6,
+ 0x00D7,
+ 0x0158,
+ 0x016E,
+ 0x00DA,
+ 0x0170,
+ 0x00DC,
+ 0x00DD,
+ 0x0162,
+ 0x00DF,
+ 0x0155,
+ 0x00E1,
+ 0x00E2,
+ 0x0103,
+ 0x00E4,
+ 0x013A,
+ 0x0107,
+ 0x00E7,
+ 0x010D,
+ 0x00E9,
+ 0x0119,
+ 0x00EB,
+ 0x011B,
+ 0x00ED,
+ 0x00EE,
+ 0x010F,
+ 0x0111,
+ 0x0144,
+ 0x0148,
+ 0x00F3,
+ 0x00F4,
+ 0x0151,
+ 0x00F6,
+ 0x00F7,
+ 0x0159,
+ 0x016F,
+ 0x00FA,
+ 0x0171,
+ 0x00FC,
+ 0x00FD,
+ 0x0163,
+ 0x02D9,
+};
+
 //---------------------------------------------------------------------------
 Ztring EmptyZtring;
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
-#if defined(__MINGW32__) || defined(__sun__) || defined(__mips__) || defined(__mipsel__) || defined(__UCLIBC__)
+#if defined(STREAM_MISSING)
 #if defined (_UNICODE)
 #define _tnprintf snwprintf
 #else
 #define _tnprintf snprintf
 #endif
+#else
+ typedef basic_stringstream<Char> tStringStream;
+ typedef basic_istringstream<Char> tiStringStream;
+ typedef basic_ostringstream<Char> toStringStream;
 #endif
-typedef basic_stringstream<Char> tStringStream;
-typedef basic_istringstream<Char> tiStringStream;
-typedef basic_ostringstream<Char> toStringStream;
 //---------------------------------------------------------------------------
 
 //***************************************************************************
@@ -200,7 +300,7 @@
 Length=wcslen(S+Start);
 wchar_t* Temp=new wchar_tLength+1;
 wcsncpy (Temp, S+Start, Length);
- TempLength=_T('\0');
+ TempLength=__T('\0');
 
 From_Unicode(Temp);
 delete Temp; //Temp=NULL;
@@ -222,96 +322,65 @@
 #endif
 #else //ZENLIB_USEWX
 #ifdef _UNICODE
- #ifdef WINDOWS
- if (IsWin9X())
+ // Don't use MultiByteToWideChar(), some characters are not well decoded
+ clear();
+ const int8u* Z=(const int8u*)S;
+ while (*Z) //0 is end
+ {
+ //1 byte
+ if (*Z<0x80)
 {
- clear();
- const int8u* Z=(const int8u*)S;
- while (*Z) //0 is end
- {
- //1 byte
- if (*Z<0x80)
- {
- operator += ((wchar_t)(*Z));
- Z++;
- }
- //2 bytes
- else if ((*Z&0xE0)==0xC0)
- {
- if ((*(Z+1)&0xC0)==0x80)
- {
- operator += ((((wchar_t)(*Z&0x1F))<<6)|(*(Z+1)&0x3F));
- Z+=2;
- }
- else
- break; //Bad character
- }
- else
- break; //Bad character (or to be encoded in UTF-16LE, not yet supported)
- }
+ operator += ((wchar_t)(*Z));
+ Z++;
 }
- else
+ //2 bytes
+ else if ((*Z&0xE0)==0xC0)
 {
- int Size=MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, S, -1, NULL, 0);
- if (Size!=0)
+ if ((*(Z+1)&0xC0)==0x80)
 {
- Char* WideString=new CharSize+1;
- MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, S, -1, WideString, Size);
- WideStringSize=L'\0';
- assign (WideString+(WideString0==0xFEFF?1:0));
- delete WideString; //WideString=NULL;
+ operator += ((((wchar_t)(*Z&0x1F))<<6)|(*(Z+1)&0x3F));
+ Z+=2;
 }
 else
+ {
 clear();
+ return *this; //Bad character
+ }
 }
- #else //WINDOWS
- clear();
- const int8u* Z=(const int8u*)S;
- while (*Z) //0 is end
+ //3 bytes
+ else if ((*Z&0xF0)==0xE0)
 {
- //1 byte
- if (*Z<0x80)
+ if ((*(Z+1)&0xC0)==0x80 && (*(Z+2)&0xC0)==0x80)
 {
- operator += ((wchar_t)(*Z));
- Z++;
+ operator += ((((wchar_t)(*Z&0x0F))<<12)|((*(Z+1)&0x3F)<<6)|(*(Z+2)&0x3F));
+ Z+=3;
 }
- //2 bytes
- else if ((*Z&0xE0)==0xC0)
+ else
 {
- if ((*(Z+1)&0xC0)==0x80)
- {
- operator += ((((wchar_t)(*Z&0x1F))<<6)|(*(Z+1)&0x3F));
- Z+=2;
- }
- else
- break; //Bad character
+ clear();
+ return *this; //Bad character
 }
- //3 bytes
- else if ((*Z&0xF0)==0xE0)
+ }
+ //4 bytes
+ else if ((*Z&0xF8)==0xF0)
+ {
+ if ((*(Z+1)&0xC0)==0x80 && (*(Z+2)&0xC0)==0x80 && (*(Z+3)&0xC0)==0x80)
 {
- if ((*(Z+1)&0xC0)==0x80 && (*(Z+2)&0xC0)==0x80)
- {
- operator += ((((wchar_t)(*Z&0x0F))<<12)|((*(Z+1)&0x3F)<<6)|(*(Z+2)&0x3F));
- Z+=3;
- }
- else
- break; //Bad character
+ operator += ((((wchar_t)(*Z&0x0F))<<18)|((*(Z+1)&0x3F)<<12)||((*(Z+2)&0x3F)<<6)|(*(Z+3)&0x3F));
+ Z+=4;
 }
- //4 bytes
- else if ((*Z&0xF8)==0xF0)
+ else
 {
- if ((*(Z+1)&0xC0)==0x80 && (*(Z+2)&0xC0)==0x80 && (*(Z+2)&0xC0)==0x80)
- {
- operator += ((((wchar_t)(*Z&0x0F))<<18)|((*(Z+1)&0x3F)<<12)||((*(Z+2)&0x3F)<<6)|(*(Z+3)&0x3F));
- Z+=4;
- }
- else
- break; //Bad character
+ clear();
+ return *this; //Bad character
 }
- else
- break; //Bad character
 }
- #endif
+ else
+ {
+ clear();
+ return *this; //Bad character
+ }
+ }
 #else
 assign(S); //Not implemented
 #endif
@@ -394,7 +463,7 @@
 clear();
 const wchar_t* SW=(const wchar_t*)S;
 size_t Pos=0;
- while (SWPos!=_T('\0'))
+ while (SWPos!=__T('\0'))
 {
 Char Temp=(Char)(((SWPos&0xFF00)>>8)+((SWPos&0x00FF)<<8));
 append(1, Temp);
@@ -423,6 +492,8 @@
 while(SLength!=0x0000)
 Length++;
 }
+ else
+ Length&=(size_t)-2; //odd number
 
 char* Temp=new charLength+2;
 memcpy (Temp, S+Start, Length);
@@ -480,6 +551,8 @@
 while(SLength!=0x0000)
 Length+=2;
 }
+ else
+ Length&=(size_t)-2; //odd number
 
 char* Temp=new charLength+2;
 memcpy (Temp, S+Start, Length);
@@ -548,8 +621,8 @@
 delete Temp; //Temp=NULL;
 #else
 assign(S+Start, Length);
- if (find(_T('\0'))!=std::string::npos)
- resize(find(_T('\0')));
+ if (find(__T('\0'))!=std::string::npos)
+ resize(find(__T('\0')));
 #endif
 return *this;
 }
@@ -582,8 +655,47 @@
 delete Temp;
 #else
 assign(S +Start, Length);
- if (find(_T('\0')) != std::string::npos)
- resize(find(_T('\0')));
+ if (find(__T('\0')) != std::string::npos)
+ resize(find(__T('\0')));
+ #endif
+ return *this;
+}
+
+Ztring& Ztring::From_ISO_8859_2(const char* S)
+{
+ size_t Length = strlen(S);
+ wchar_t* Temp = new wchar_tLength +1;
+
+ for (size_t Pos=0; Pos<Length+1; Pos++)
+ {
+ if ((int8u)SPos>=0xA0)
+ TempPos=(wchar_t)Ztring_ISO_8859_2((int8u)SPos)-0xA0;
+ else
+ TempPos=(wchar_t)((int8u)SPos);
+ }
+
+ From_Unicode(Temp);
+ delete Temp;
+ return *this;
+}
+
+Ztring& Ztring::From_ISO_8859_2(const char* S, size_type Start, size_type Length)
+{
+ if (S==NULL)
+ return *this;
+
+ if (Length==Error)
+ Length=strlen(S+Start);
+ #ifdef _UNICODE
+ char* Temp = new charLength+1;
+ strncpy(Temp, S +Start, Length);
+ TempLength = '\0';
+ From_ISO_8859_2(Temp);
+ delete Temp;
+ #else
+ assign(S +Start, Length);
+ if (find(__T('\0')) != std::string::npos)
+ resize(find(__T('\0')));
 #endif
 return *this;
 }
@@ -594,12 +706,12 @@
 S1.From_CC1((int8u) ((S.hi&0x000000FF00000000LL)>>32)); append(S1);
 S1.From_CC1((int8u) ((S.hi&0x0000FF0000000000LL)>>40)); append(S1);
 S1.From_CC1((int8u) ((S.hi&0x00FF000000000000LL)>>48)); append(S1);
- S1.From_CC1((int8u) ((S.hi&0xFF00000000000000LL)>>56)); append(S1); append(_T("-"));
+ S1.From_CC1((int8u) ((S.hi&0xFF00000000000000LL)>>56)); append(S1); append(__T("-"));
 S1.From_CC1((int8u) ((S.hi&0x0000000000FF0000LL)>>16)); append(S1);
- S1.From_CC1((int8u) ((S.hi&0x00000000FF000000LL)>>24)); append(S1); append(_T("-"));
+ S1.From_CC1((int8u) ((S.hi&0x00000000FF000000LL)>>24)); append(S1); append(__T("-"));
 S1.From_CC1((int8u) ( S.hi&0x00000000000000FFLL )); append(S1);
- S1.From_CC1((int8u) ((S.hi&0x000000000000FF00LL)>> 8)); append(S1); append(_T("-"));
- S1.From_CC2((int16u)((S.lo&0xFFFF000000000000LL)>>48)); append(S1); append(_T("-"));
+ S1.From_CC1((int8u) ((S.hi&0x000000000000FF00LL)>> 8)); append(S1); append(__T("-"));
+ S1.From_CC2((int16u)((S.lo&0xFFFF000000000000LL)>>48)); append(S1); append(__T("-"));
 S1.From_CC2((int16u)((S.lo&0x0000FFFF00000000LL)>>32)); append(S1);
 S1.From_CC2((int16u)((S.lo&0x00000000FFFF0000LL)>>16)); append(S1);
 S1.From_CC2((int16u)( S.lo&0x000000000000FFFFLL )); append(S1);
@@ -611,10 +723,10 @@
 {
 Ztring S1;
 S1.From_CC2((int16u)((S.hi&0xFFFF000000000000LL)>>48)); assign(S1);
- S1.From_CC2((int16u)((S.hi&0x0000FFFF00000000LL)>>32)); append(S1); append(_T("-"));
- S1.From_CC2((int16u)((S.hi&0x00000000FFFF0000LL)>>16)); append(S1); append(_T("-"));
- S1.From_CC2((int16u)( S.hi&0x000000000000FFFFLL )); append(S1); append(_T("-"));
- S1.From_CC2((int16u)((S.lo&0xFFFF000000000000LL)>>48)); append(S1); append(_T("-"));
+ S1.From_CC2((int16u)((S.hi&0x0000FFFF00000000LL)>>32)); append(S1); append(__T("-"));
+ S1.From_CC2((int16u)((S.hi&0x00000000FFFF0000LL)>>16)); append(S1); append(__T("-"));
+ S1.From_CC2((int16u)( S.hi&0x000000000000FFFFLL )); append(S1); append(__T("-"));
+ S1.From_CC2((int16u)((S.lo&0xFFFF000000000000LL)>>48)); append(S1); append(__T("-"));
 S1.From_CC2((int16u)((S.lo&0x0000FFFF00000000LL)>>32)); append(S1);
 S1.From_CC2((int16u)((S.lo&0x00000000FFFF0000LL)>>16)); append(S1);
 S1.From_CC2((int16u)( S.lo&0x000000000000FFFFLL )); append(S1);
@@ -633,7 +745,7 @@
 
 //Test
 if (empty())
- assign(_T("(empty)"));
+ assign(__T("(empty)"));
 
 return *this;
 }
@@ -648,7 +760,7 @@
 
 //Test
 if (empty())
- assign(_T("(empty)"));
+ assign(__T("(empty)"));
 
 return *this;
 }
@@ -657,7 +769,7 @@
 {
 clear();
 Ztring Pos1; Pos1.From_Number(S, 16);
- resize(4-Pos1.size(), _T('0'));
+ resize(4-Pos1.size(), __T('0'));
 append(Pos1);
 MakeUpperCase();
 
@@ -668,7 +780,7 @@
 {
 clear();
 Ztring Pos1; Pos1.From_Number(S, 16);
- resize(2-Pos1.size(), _T('0'));
+ resize(2-Pos1.size(), __T('0'));
 append(Pos1);
 MakeUpperCase();
 
@@ -677,7 +789,7 @@
 
 Ztring& Ztring::From_Number (const int8s I, int8u Radix)
 {
- #if defined(__MINGW32__) || ( defined(__sun__) && !defined(__sparc__) ) || defined(__UCLIBC__)
+ #if defined(STREAM_MISSING)
 if (Radix==0)
 {
 clear();
@@ -687,7 +799,7 @@
 #ifdef __MINGW32__
 _itot (I, C1, Radix);
 #else
- _tnprintf(C1, 32, Radix==10?_T("%d"):(Radix==16?_T("%x"):(Radix==8?_T("%o"):_T(""))), I);
+ _tnprintf(C1, 32, Radix==10?__T("%d"):(Radix==16?__T("%x"):(Radix==8?__T("%o"):__T(""))), I);
 #endif
 assign (C1);
 delete C1; //C1=NULL;
@@ -706,7 +818,7 @@
 
 Ztring& Ztring::From_Number (const int8u I, int8u Radix)
 {
- #if defined(__MINGW32__) || ( defined(__sun__) && !defined(__sparc__) ) || defined(__UCLIBC__)
+ #if defined(STREAM_MISSING)
 if (Radix==0)
 {
 clear();
@@ -716,18 +828,31 @@
 #ifdef __MINGW32__
 _ultot (I, C1, Radix);
 #else
- _tnprintf(C1, 32, Radix==10?_T("%d"):(Radix==16?_T("%x"):(Radix==8?_T("%o"):_T(""))), I);
+ _tnprintf(C1, 32, Radix==10?__T("%d"):(Radix==16?__T("%x"):(Radix==8?__T("%o"):__T(""))), I);
 #endif
 assign (C1);
 delete C1; //C1=NULL;
 #else
- toStringStream SS;
- #ifdef UNICODE
- SS << setbase(Radix) << I;
- #else //UNICODE
- SS << setbase(Radix) << (size_t)I; //On linux (at least), (un)signed char is detected as a char
- #endif //UNICODE
- assign(SS.str());
+ if (Radix==2)
+ {
+ clear();
+ for (int8u Pos=0; Pos<8; Pos++)
+ {
+ if (I<(((int8u)1)<<Pos))
+ break;
+ insert(0, 1, (I&(((int8u)1)<<Pos))?__T('1'):__T('0'));
+ }
+ }
+ else
+ {
+ toStringStream SS;
+ #ifdef UNICODE
+ SS << setbase(Radix) << I;
+ #else //UNICODE
+ SS << setbase(Radix) << (size_t)I; //On linux (at least), (un)signed char is detected as a char
+ #endif //UNICODE
+ assign(SS.str());
+ }
 #endif
 MakeUpperCase();
 return *this;
@@ -735,7 +860,7 @@
 
 Ztring& Ztring::From_Number (const int16s I, int8u Radix)
 {
- #if defined(__MINGW32__) || ( defined(__sun__) && !defined(__sparc__) ) || defined(__UCLIBC__)
+ #if defined(STREAM_MISSING)
 if (Radix==0)
 {
 clear();
@@ -745,7 +870,7 @@
 #ifdef __MINGW32__
 _itot (I, C1, Radix);
 #else
- _tnprintf(C1, 32, Radix==10?_T("%d"):(Radix==16?_T("%x"):(Radix==8?_T("%o"):_T(""))), I);
+ _tnprintf(C1, 32, Radix==10?__T("%d"):(Radix==16?__T("%x"):(Radix==8?__T("%o"):__T(""))), I);
 #endif
 assign (C1);
 delete C1; //C1=NULL;
@@ -760,7 +885,7 @@
 
 Ztring& Ztring::From_Number (const int16u I, int8u Radix)
 {
- #if defined(__MINGW32__) || ( defined(__sun__) && !defined(__sparc__) ) || defined(__UCLIBC__)
+ #if defined(STREAM_MISSING)
 if (Radix==0)
 {
 clear();
@@ -770,14 +895,27 @@
 #ifdef __MINGW32__
 _ultot (I, C1, Radix);
 #else
- _tnprintf(C1, 32, Radix==10?_T("%u"):(Radix==16?_T("%x"):(Radix==8?_T("%o"):_T(""))), I);
+ _tnprintf(C1, 32, Radix==10?__T("%u"):(Radix==16?__T("%x"):(Radix==8?__T("%o"):__T(""))), I);
 #endif
 assign (C1);
 delete C1; //C1=NULL;
 #else
- toStringStream SS;
- SS << setbase(Radix) << I;
- assign(SS.str());
+ if (Radix==2)
+ {
+ clear();
+ for (int8u Pos=0; Pos<16; Pos++)
+ {
+ if (I<(((int16u)1)<<Pos))
+ break;
+ insert(0, 1, (I&(((int16u)1)<<Pos))?__T('1'):__T('0'));
+ }
+ }
+ else
+ {
+ toStringStream SS;
+ SS << setbase(Radix) << I;
+ assign(SS.str());
+ }
 #endif
 MakeUpperCase();
 return *this;
@@ -785,7 +923,7 @@
 
 Ztring& Ztring::From_Number (const int32s I, int8u Radix)
 {
- #if defined(__MINGW32__) || ( defined(__sun__) && !defined(__sparc__) ) || defined(__UCLIBC__)
+ #if defined(STREAM_MISSING)
 if (Radix==0)
 {
 clear();
@@ -795,7 +933,7 @@
 #ifdef __MINGW32__
 _itot (I, C1, Radix);
 #else
- _tnprintf(C1, 32, Radix==10?_T("%ld"):(Radix==16?_T("%lx"):(Radix==8?_T("%lo"):_T(""))), I);
+ _tnprintf(C1, 32, Radix==10?__T("%ld"):(Radix==16?__T("%lx"):(Radix==8?__T("%lo"):__T(""))), I);
 #endif
 assign (C1);
 delete C1; //C1=NULL;
@@ -810,7 +948,7 @@
 
 Ztring& Ztring::From_Number (const int32u I, int8u Radix)
 {
- #if defined(__MINGW32__) || ( defined(__sun__) && !defined(__sparc__) ) || defined(__UCLIBC__)
+ #if defined(STREAM_MISSING)
 if (Radix==0)
 {
 clear();
@@ -820,14 +958,27 @@
 #ifdef __MINGW32__
 _ultot (I, C1, Radix);
 #else
- _tnprintf(C1, 32, Radix==10?_T("%lu"):(Radix==16?_T("%lx"):(Radix==8?_T("%lo"):_T(""))), I);
+ _tnprintf(C1, 32, Radix==10?__T("%lu"):(Radix==16?__T("%lx"):(Radix==8?__T("%lo"):__T(""))), I);
 #endif
 assign (C1);
 delete C1; //C1=NULL;
 #else
- toStringStream SS;
- SS << setbase(Radix) << I;
- assign(SS.str());
+ if (Radix==2)
+ {
+ clear();
+ for (int8u Pos=0; Pos<32; Pos++)
+ {
+ if (I<(((int32u)1)<<Pos))
+ break;
+ insert(0, 1, (I&(((int32u)1)<<Pos))?__T('1'):__T('0'));
+ }
+ }
+ else
+ {
+ toStringStream SS;
+ SS << setbase(Radix) << I;
+ assign(SS.str());
+ }
 #endif
 MakeUpperCase();
 return *this;
@@ -835,7 +986,7 @@
 
 Ztring& Ztring::From_Number (const int64s I, int8u Radix)
 {
- #if defined(__MINGW32__) || ( defined(__sun__) && !defined(__sparc__) ) || defined(__UCLIBC__)
+ #if defined(STREAM_MISSING)
 if (Radix==0)
 {
 clear();
@@ -845,7 +996,7 @@
 #ifdef __MINGW32__
 _i64tot (I, C1, Radix);
 #else
- _tnprintf(C1, 64, Radix==10?_T("%lld"):(Radix==16?_T("%llx"):(Radix==8?_T("%llo"):_T(""))), I);
+ _tnprintf(C1, 64, Radix==10?__T("%lld"):(Radix==16?__T("%llx"):(Radix==8?__T("%llo"):__T(""))), I);
 #endif
 assign (C1);
 delete C1; //C1=NULL;
@@ -860,7 +1011,7 @@
 
 Ztring& Ztring::From_Number (const int64u I, int8u Radix)
 {
- #if defined(__MINGW32__) || ( defined(__sun__) && !defined(__sparc__) ) || defined(__UCLIBC__)
+ #if defined(STREAM_MISSING)
 if (Radix==0)
 {
 clear();
@@ -870,14 +1021,27 @@
 #ifdef __MINGW32__
 _ui64tot (I, C1, Radix);
 #else
- _tnprintf(C1, 64, Radix==10?_T("%llu"):(Radix==16?_T("%llx"):(Radix==8?_T("%llo"):_T(""))), I);
+ _tnprintf(C1, 64, Radix==10?__T("%llu"):(Radix==16?__T("%llx"):(Radix==8?__T("%llo"):__T(""))), I);
 #endif
 assign (C1);
 delete C1; //C1=NULL;
 #else
- toStringStream SS;
- SS << setbase(Radix) << I;
- assign(SS.str());
+ if (Radix==2)
+ {
+ clear();
+ for (int8u Pos=0; Pos<32; Pos++)
+ {
+ if (I<(((int64u)1)<<Pos))
+ break;
+ insert(0, 1, (I&(((int64u)1)<<Pos))?__T('1'):__T('0'));
+ }
+ }
+ else
+ {
+ toStringStream SS;
+ SS << setbase(Radix) << I;
+ assign(SS.str());
+ }
 #endif
 MakeUpperCase();
 return *this;
@@ -892,24 +1056,24 @@
 
 Ztring& Ztring::From_Number (const float32 F, int8u Precision, ztring_t Options)
 {
- #if defined(__MINGW32__) || ( defined(__sun__) && !defined(__sparc__) ) || defined(__mips__) || defined(__mipsel__) || defined(__UCLIBC__)
+ #if defined(STREAM_MISSING)
 Char C1100;
- _tnprintf (C1, 99, (Ztring(_T("%."))+Ztring::ToZtring(Precision)+_T("f")).c_str(), F);
+ _tnprintf (C1, 99, (Ztring(__T("%."))+Ztring::ToZtring(Precision)+__T("f")).c_str(), F);
 assign(C1);
 #else
 toStringStream SS;
 SS << setprecision(Precision) << fixed << F;
 assign(SS.str());
 #if defined(__BORLANDC__)
- FindAndReplace(_T(","), _T(".")); //Borland C++ Builder 2010+Windows Seven put a comma for istringstream, but does not support comma for ostringstream
+ FindAndReplace(__T(","), __T(".")); //Borland C++ Builder 2010+Windows Seven put a comma for istringstream, but does not support comma for ostringstream
 #endif
 #endif
 
- if ((Options & Ztring_NoZero && size()>0) && find(_T('.'))>0)
+ if ((Options & Ztring_NoZero && size()>0) && find(__T('.'))>0)
 {
- while (size()>0 && ((*this)size()-1==_T('0')))
+ while (size()>0 && ((*this)size()-1==__T('0')))
 resize(size()-1);
- if (size()>0 && (*this)size()-1==_T('.'))
+ if (size()>0 && (*this)size()-1==__T('.'))
 resize(size()-1);
 }
 
@@ -918,24 +1082,24 @@
 
 Ztring& Ztring::From_Number (const float64 F, int8u Precision, ztring_t Options)
 {
- #if defined(__MINGW32__) || ( defined(__sun__) && !defined(__sparc__) ) || defined(__mips__) || defined(__mipsel__) || defined(__UCLIBC__)
+ #if defined(STREAM_MISSING)
 Char C1100;
- _tnprintf (C1, 99, (Ztring(_T("%."))+Ztring::ToZtring(Precision)+_T("f")).c_str(), F);
+ _tnprintf (C1, 99, (Ztring(__T("%."))+Ztring::ToZtring(Precision)+__T("f")).c_str(), F);
 assign(C1);
 #else
 toStringStream SS;
 SS << setprecision(Precision) << fixed << F;
 assign(SS.str());
 #if defined(__BORLANDC__)
- FindAndReplace(_T(","), _T(".")); //Borland C++ Builder 2010+Windows Seven put a comma for istringstream, but does not support comma for ostringstream
+ FindAndReplace(__T(","), __T(".")); //Borland C++ Builder 2010+Windows Seven put a comma for istringstream, but does not support comma for ostringstream
 #endif
 #endif
 
- if ((Options & Ztring_NoZero && size()>0) && find(_T('.'))>0)
+ if ((Options & Ztring_NoZero && size()>0) && find(__T('.'))>0)
 {
- while (size()>0 && ((*this)size()-1==_T('0')))
+ while (size()>0 && ((*this)size()-1==__T('0')))
 resize(size()-1);
- if (size()>0 && (*this)size()-1==_T('.'))
+ if (size()>0 && (*this)size()-1==__T('.'))
 resize(size()-1);
 }
 
@@ -944,47 +1108,56 @@
 
 Ztring& Ztring::From_Number (const float80 F, int8u Precision, ztring_t Options)
 {
- #if defined(__MINGW32__) || ( defined(__sun__) && !defined(__sparc__) ) || defined(__mips__) || defined(__mipsel__) || defined(__UCLIBC__)
+ #if defined(STREAM_MISSING)
 Char C1100;
- _tnprintf (C1, 99, (Ztring(_T("%."))+Ztring::ToZtring(Precision)+_T("f")).c_str(), F);
+ _tnprintf (C1, 99, (Ztring(__T("%."))+Ztring::ToZtring(Precision)+__T("f")).c_str(), F);
 assign(C1);
 #else
 toStringStream SS;
 SS << setprecision(Precision) << fixed << F;
 assign(SS.str());
 #if defined(__BORLANDC__)
- FindAndReplace(_T(","), _T(".")); //Borland C++ Builder 2010+Windows Seven put a comma for istringstream, but does not support comma for ostringstream
+ FindAndReplace(__T(","), __T(".")); //Borland C++ Builder 2010+Windows Seven put a comma for istringstream, but does not support comma for ostringstream
 #endif
 #endif
 
- if ((Options & Ztring_NoZero && size()>0) && find(_T('.'))>0)
+ if ((Options & Ztring_NoZero && size()>0) && find(__T('.'))>0)
 {
- while (size()>0 && ((*this)size()-1==_T('0')))
+ while (size()>0 && ((*this)size()-1==__T('0')))
 resize(size()-1);
- if (size()>0 && (*this)size()-1==_T('.'))
+ if (size()>0 && (*this)size()-1==__T('.'))
 resize(size()-1);
 }
 
 return *this;
 }
 
-#ifdef NEED_SIZET
+#ifdef SIZE_T_IS_LONG
 Ztring& Ztring::From_Number (const size_t I, int8u Radix)
 {
- toStringStream SS;
- SS << setbase(Radix) << I;
- assign(SS.str());
+ #if defined(STREAM_MISSING)
+ Char C1100;
+ _tnprintf(C1, 64, Radix==10?__T("%zu"):(Radix==16?__T("%zx"):(Radix==8?__T("%zo"):__T(""))), I);
+ assign(C1);
+ #else
+ toStringStream SS;
+ SS << setbase(Radix) << I;
+ assign(SS.str());
+ #if defined(__BORLANDC__)
+ FindAndReplace(__T(","), __T(".")); //Borland C++ Builder 2010+Windows Seven put a comma for istringstream, but does not support comma for ostringstream
+ #endif
+ #endif
 MakeUpperCase();
 return *this;
 }
-#endif //NEED_SIZET
+#endif //SIZE_T_IS_LONG
 
 Ztring& Ztring::From_BCD (const int8u I)
 {
- #if ( defined(__sun__) && !defined(__sparc__) )
+ #if defined(STREAM_MISSING)
 clear();
- append(1, _T('0')+I/0x10);
- append(1, _T('0')+I%0x10);
+ append(1, __T('0')+I/0x10);
+ append(1, __T('0')+I%0x10);
 #else
 toStringStream SS;
 SS << I/0x10;
@@ -1011,20 +1184,20 @@
 int64u MS=Value -((HH*60+MM)*60+SS)*1000;
 Ztring DateT;
 Ztring Date;
- DateT.From_Number(HH); if (DateT.size()<2){DateT=Ztring(_T("0"))+DateT;}
+ DateT.From_Number(HH); if (DateT.size()<2){DateT=Ztring(__T("0"))+DateT;}
 Date+=DateT;
- Date+=_T(":");
- DateT.From_Number(MM); if (DateT.size()<2){DateT=Ztring(_T("0"))+DateT;}
+ Date+=__T(":");
+ DateT.From_Number(MM); if (DateT.size()<2){DateT=Ztring(__T("0"))+DateT;}
 Date+=DateT;
- Date+=_T(":");
- DateT.From_Number(SS); if (DateT.size()<2){DateT=Ztring(_T("0"))+DateT;}
+ Date+=__T(":");
+ DateT.From_Number(SS); if (DateT.size()<2){DateT=Ztring(__T("0"))+DateT;}
 Date+=DateT;
- Date+=_T(".");
- DateT.From_Number(MS); if (DateT.size()<2){DateT=Ztring(_T("00"))+DateT;} else if (DateT.size()<3){DateT=Ztring(_T("0"))+DateT;}
+ Date+=__T(".");
+ DateT.From_Number(MS); if (DateT.size()<2){DateT=Ztring(__T("00"))+DateT;} else if (DateT.size()<3){DateT=Ztring(__T("0"))+DateT;}
 Date+=DateT;
 if (Negative)
 {
- assign(_T("-"));
+ assign(__T("-"));
 append(Date);
 }
 else
@@ -1041,16 +1214,16 @@
 int64u MS=Value -((HH*60+MM)*60+SS)*1000;
 Ztring DateT;
 Ztring Date;
- DateT.From_Number(HH); if (DateT.size()<2){DateT=Ztring(_T("0"))+DateT;}
+ DateT.From_Number(HH); if (DateT.size()<2){DateT=Ztring(__T("0"))+DateT;}
 Date+=DateT;
- Date+=_T(":");
- DateT.From_Number(MM); if (DateT.size()<2){DateT=Ztring(_T("0"))+DateT;}
+ Date+=__T(":");
+ DateT.From_Number(MM); if (DateT.size()<2){DateT=Ztring(__T("0"))+DateT;}
 Date+=DateT;
- Date+=_T(":");
- DateT.From_Number(SS); if (DateT.size()<2){DateT=Ztring(_T("0"))+DateT;}
+ Date+=__T(":");
+ DateT.From_Number(SS); if (DateT.size()<2){DateT=Ztring(__T("0"))+DateT;}
 Date+=DateT;
- Date+=_T(".");
- DateT.From_Number(MS); if (DateT.size()<2){DateT=Ztring(_T("00"))+DateT;} else if (DateT.size()<3){DateT=Ztring(_T("0"))+DateT;}
+ Date+=__T(".");
+ DateT.From_Number(MS); if (DateT.size()<2){DateT=Ztring(__T("00"))+DateT;} else if (DateT.size()<3){DateT=Ztring(__T("0"))+DateT;}
 Date+=DateT;
 assign (Date.c_str());
 return *this;
@@ -1061,10 +1234,10 @@
 if (Value>=11644473600000LL) //Values <1970 are not supported
 {
 Date_From_Seconds_1970((int32u)((Value-11644473600000LL)/1000));
- append(_T("."));
+ append(__T("."));
 Ztring Milliseconds; Milliseconds.From_Number(Value%1000);
 while (Milliseconds.size()<3)
- Milliseconds+=_T('0');
+ Milliseconds+=__T('0');
 append(Milliseconds);
 }
 else
@@ -1108,9 +1281,9 @@
 else
 Date+=wxTimeSpan::Seconds(Value);
 
- Ztring ToReturn=_T("UTC ");
+ Ztring ToReturn=__T("UTC ");
 ToReturn+=Date.FormatISODate();
- ToReturn+=_T(" ");
+ ToReturn+=__T(" ");
 ToReturn+=Date.FormatISOTime();
 
 assign (ToReturn.c_str());
@@ -1134,22 +1307,22 @@
 time_t Time=(time_t)Value;
 struct tm *Gmt=gmtime(&Time);
 Ztring DateT;
- Ztring Date=_T("UTC ");
+ Ztring Date=__T("UTC ");
 Date+=Ztring::ToZtring((Gmt->tm_year+1900));
- Date+=_T("-");
- DateT.From_Number(Gmt->tm_mon+1); if (DateT.size()<2){DateT=Ztring(_T("0"))+Ztring::ToZtring(Gmt->tm_mon+1);}
+ Date+=__T("-");
+ DateT.From_Number(Gmt->tm_mon+1); if (DateT.size()<2){DateT=Ztring(__T("0"))+Ztring::ToZtring(Gmt->tm_mon+1);}
 Date+=DateT;
- Date+=_T("-");
- DateT.From_Number(Gmt->tm_mday); if (DateT.size()<2){DateT=Ztring(_T("0"))+Ztring::ToZtring(Gmt->tm_mday);}
+ Date+=__T("-");
+ DateT.From_Number(Gmt->tm_mday); if (DateT.size()<2){DateT=Ztring(__T("0"))+Ztring::ToZtring(Gmt->tm_mday);}
 Date+=DateT;
- Date+=_T(" ");
- DateT.From_Number(Gmt->tm_hour); if (DateT.size()<2){DateT=Ztring(_T("0"))+Ztring::ToZtring(Gmt->tm_hour);}
+ Date+=__T(" ");
+ DateT.From_Number(Gmt->tm_hour); if (DateT.size()<2){DateT=Ztring(__T("0"))+Ztring::ToZtring(Gmt->tm_hour);}
 Date+=DateT;
- Date+=_T(":");
- DateT=Ztring::ToZtring(Gmt->tm_min); if (DateT.size()<2){DateT=Ztring(_T("0"))+Ztring::ToZtring(Gmt->tm_min);}
+ Date+=__T(":");
+ DateT=Ztring::ToZtring(Gmt->tm_min); if (DateT.size()<2){DateT=Ztring(__T("0"))+Ztring::ToZtring(Gmt->tm_min);}
 Date+=DateT;
- Date+=_T(":");
- DateT.From_Number(Gmt->tm_sec); if (DateT.size()<2){DateT=Ztring(_T("0"))+Ztring::ToZtring(Gmt->tm_sec);}
+ Date+=__T(":");
+ DateT.From_Number(Gmt->tm_sec); if (DateT.size()<2){DateT=Ztring(__T("0"))+Ztring::ToZtring(Gmt->tm_sec);}
 Date+=DateT;
 assign (Date.c_str());
 return *this;
@@ -1162,20 +1335,20 @@
 Ztring DateT;
 Ztring Date;
 Date+=Ztring::ToZtring((Gmt->tm_year+1900));
- Date+=_T("-");
- DateT.From_Number(Gmt->tm_mon+1); if (DateT.size()<2){DateT=Ztring(_T("0"))+Ztring::ToZtring(Gmt->tm_mon+1);}
+ Date+=__T("-");
+ DateT.From_Number(Gmt->tm_mon+1); if (DateT.size()<2){DateT=Ztring(__T("0"))+Ztring::ToZtring(Gmt->tm_mon+1);}
 Date+=DateT;
- Date+=_T("-");
- DateT.From_Number(Gmt->tm_mday); if (DateT.size()<2){DateT=Ztring(_T("0"))+Ztring::ToZtring(Gmt->tm_mday);}
+ Date+=__T("-");
+ DateT.From_Number(Gmt->tm_mday); if (DateT.size()<2){DateT=Ztring(__T("0"))+Ztring::ToZtring(Gmt->tm_mday);}
 Date+=DateT;
- Date+=_T(" ");
- DateT.From_Number(Gmt->tm_hour); if (DateT.size()<2){DateT=Ztring(_T("0"))+Ztring::ToZtring(Gmt->tm_hour);}
+ Date+=__T(" ");
+ DateT.From_Number(Gmt->tm_hour); if (DateT.size()<2){DateT=Ztring(__T("0"))+Ztring::ToZtring(Gmt->tm_hour);}
 Date+=DateT;
- Date+=_T(":");
- DateT=Ztring::ToZtring(Gmt->tm_min); if (DateT.size()<2){DateT=Ztring(_T("0"))+Ztring::ToZtring(Gmt->tm_min);}
+ Date+=__T(":");
+ DateT=Ztring::ToZtring(Gmt->tm_min); if (DateT.size()<2){DateT=Ztring(__T("0"))+Ztring::ToZtring(Gmt->tm_min);}
 Date+=DateT;
- Date+=_T(":");
- DateT.From_Number(Gmt->tm_sec); if (DateT.size()<2){DateT=Ztring(_T("0"))+Ztring::ToZtring(Gmt->tm_sec);}
+ Date+=__T(":");
+ DateT.From_Number(Gmt->tm_sec); if (DateT.size()<2){DateT=Ztring(__T("0"))+Ztring::ToZtring(Gmt->tm_sec);}
 Date+=DateT;
 assign (Date.c_str());
 return *this;
@@ -1191,21 +1364,21 @@
 }
 
 #ifdef ZENLIB_USEWX
- Ztring ToReturn=_T("UTC ");
+ Ztring ToReturn=__T("UTC ");
 wxDateTime Date;
 Ztring DateS;
 DateS.From_Local(Value, Value_Size).c_str();
- if (!DateS.empty() && DateSDateS.size()-1==_T('\n'))
+ if (!DateS.empty() && DateSDateS.size()-1==__T('\n'))
 DateS.resize(DateS.size()-1);
 
 //Some strange formating : exactly 24 bytes (or 25 with 0x0A at the end) and Year is at the end
- if (DateS.size()==24 && DateS23>=_T('0') && DateS23<=_T('9') && DateS21>=_T('0') && DateS21<=_T('9') && DateS19==_T(' '))
- Date.ParseFormat(DateS.c_str(), _T("%a %b %d %H:%M:%S %Y"));
+ if (DateS.size()==24 && DateS23>=__T('0') && DateS23<=__T('9') && DateS21>=__T('0') && DateS21<=__T('9') && DateS19==__T(' '))
+ Date.ParseFormat(DateS.c_str(), __T("%a %b %d %H:%M:%S %Y"));
 //ISO date
- else if (DateS.size()==10 && (DateS4<_T('0') || DateS4>_T('9')) && (DateS7<_T('0') || DateS7>_T('9')))
+ else if (DateS.size()==10 && (DateS4<__T('0') || DateS4>__T('9')) && (DateS7<__T('0') || DateS7>__T('9')))
 {
- DateS4=_T('-');
- DateS7=_T('-');
+ DateS4=__T('-');
+ DateS7=__T('-');
 ToReturn+=DateS;
 }
 //Default
@@ -1215,7 +1388,7 @@
 if (ToReturn.size()<5)
 {
 ToReturn+=Date.FormatISODate();
- ToReturn+=_T(" ");
+ ToReturn+=__T(" ");
 ToReturn+=Date.FormatISOTime();
 }
 else if (ToReturn.size()<5)
@@ -1224,17 +1397,104 @@
 assign (ToReturn.c_str());
 #else //ZENLIB_USEWX
 Ztring DateS; DateS.From_Local(Value, 0, Value_Size);
- if (DateS.size()==20 && DateS4==_T('-') && DateS7==_T('-') && DateS10==_T('T') && DateS13==_T(':') && DateS16==_T(':') && DateS19==_T('Z'))
+ //Unix style formating : exactly 24 bytes (or 25 with 0x0A at the end) and Year is at the end
+ if ((DateS.size()==24 || (DateS.size()==25 && DateS24==__T('\n'))) && DateS23>=__T('0') && DateS23<=__T('9') && DateS21>=__T('0') && DateS21<=__T('9') && DateS19==__T(' '))
+ {
+ clear();
+ append(1, DateS20);
+ append(1, DateS21);
+ append(1, DateS22);
+ append(1, DateS23);
+ append(1, __T('-'));
+ if (DateS4==__T('J') && DateS5==__T('a') && DateS6==__T('n') && DateS7==__T(' '))
+ {
+ append(1, __T('0'));
+ append(1, __T('1'));
+ }
+ else if (DateS4==__T('F') && DateS5==__T('e') && DateS6==__T('b') && DateS7==__T(' '))
+ {
+ append(1, __T('0'));
+ append(1, __T('2'));
+ }
+ else if (DateS4==__T('M') && DateS5==__T('a') && DateS6==__T('r') && DateS7==__T(' '))
+ {
+ append(1, __T('0'));
+ append(1, __T('3'));
+ }
+ else if (DateS4==__T('A') && DateS5==__T('p') && DateS6==__T('r') && DateS7==__T(' '))
+ {
+ append(1, __T('0'));
+ append(1, __T('4'));
+ }
+ else if (DateS4==__T('M') && DateS5==__T('a') && DateS6==__T('y') && DateS7==__T(' '))
+ {
+ append(1, __T('0'));
+ append(1, __T('5'));
+ }
+ else if (DateS4==__T('J') && DateS5==__T('u') && DateS6==__T('n') && DateS7==__T(' '))
+ {
+ append(1, __T('0'));
+ append(1, __T('6'));
+ }
+ else if (DateS4==__T('J') && DateS5==__T('u') && DateS6==__T('l') && DateS7==__T(' '))
+ {
+ append(1, __T('0'));
+ append(1, __T('7'));
+ }
+ else if (DateS4==__T('A') && DateS5==__T('u') && DateS6==__T('g') && DateS7==__T(' '))
+ {
+ append(1, __T('0'));
+ append(1, __T('8'));
+ }
+ else if (DateS4==__T('S') && DateS5==__T('e') && DateS6==__T('p') && DateS7==__T(' '))
+ {
+ append(1, __T('0'));
+ append(1, __T('9'));
+ }
+ else if (DateS4==__T('O') && DateS5==__T('c') && DateS6==__T('t') && DateS7==__T(' '))
+ {
+ append(1, __T('1'));
+ append(1, __T('0'));
+ }
+ else if (DateS4==__T('N') && DateS5==__T('o') && DateS6==__T('v') && DateS7==__T(' '))
+ {
+ append(1, __T('1'));
+ append(1, __T('1'));
+ }
+ else if (DateS4==__T('D') && DateS5==__T('e') && DateS6==__T('c') && DateS7==__T(' '))
+ {
+ append(1, __T('1'));
+ append(1, __T('2'));
+ }
+ else
+ {
+ assign(DateS);
+ return *this;
+ }
+ append(1, __T('-'));
+ append(1, DateS8);
+ append(1, DateS9);
+ append(1, __T(' '));
+ append(1, DateS11);
+ append(1, DateS12);
+ append(1, __T(':'));
+ append(1, DateS14);
+ append(1, DateS15);
+ append(1, __T(':'));
+ append(1, DateS17);
+ append(1, DateS18);
+ }
+ else if (DateS.size()==20 && DateS4==__T('-') && DateS7==__T('-') && DateS10==__T('T') && DateS13==__T(':') && DateS16==__T(':') && DateS19==__T('Z'))
 {
 DateS.resize(19);
- DateS10=_T(' ');
- assign(_T("UTC "));
+ DateS10=__T(' ');
+ assign(__T("UTC "));
 append(DateS);
 }
- else if (DateS.size()==23 && DateS4==_T('-') && DateS7==_T('-') && DateS10==_T(' ') && DateS14==_T(' ') && DateS17==_T(':') && DateS20==_T(':'))
+ else if (DateS.size()==23 && DateS4==__T('-') && DateS7==__T('-') && DateS10==__T(' ') && DateS14==__T(' ') && DateS17==__T(':') && DateS20==__T(':'))
 {
 DateS.erase(10, 4);
- //assign(_T("UTC ")); //Is not UTC
+ //assign(__T("UTC ")); //Is not UTC
 append(DateS);
 }
 else
@@ -1246,23 +1506,23 @@
 Ztring& Ztring::Date_From_Numbers (const int8u Year, const int8u Month, const int8u Day, const int8u Hour, const int8u Minute, const int8u Second)
 {
 Ztring DateT;
- Ztring Date=_T("UTC ");
- DateT.From_Number(Year); if (DateT.size()<2){DateT=Ztring(_T("200"))+Ztring::ToZtring(Year);}; if (DateT.size()<3){DateT=Ztring(_T("20"))+Ztring::ToZtring(Year);}
+ Ztring Date=__T("UTC ");
+ DateT.From_Number(Year); if (DateT.size()<2){DateT=Ztring(__T("200"))+Ztring::ToZtring(Year);}; if (DateT.size()<3){DateT=Ztring(__T("20"))+Ztring::ToZtring(Year);}
 Date+=DateT;
- Date+=_T("-");
- DateT.From_Number(Month); if (DateT.size()<2){DateT=Ztring(_T("0"))+Ztring::ToZtring(Month);}
+ Date+=__T("-");
+ DateT.From_Number(Month); if (DateT.size()<2){DateT=Ztring(__T("0"))+Ztring::ToZtring(Month);}
 Date+=DateT;
- Date+=_T("-");
- DateT.From_Number(Day); if (DateT.size()<2){DateT=Ztring(_T("0"))+Ztring::ToZtring(Day);}
+ Date+=__T("-");
+ DateT.From_Number(Day); if (DateT.size()<2){DateT=Ztring(__T("0"))+Ztring::ToZtring(Day);}
 Date+=DateT;
- Date+=_T(" ");
- DateT.From_Number(Hour); if (DateT.size()<2){DateT=Ztring(_T("0"))+Ztring::ToZtring(Hour);}
+ Date+=__T(" ");
+ DateT.From_Number(Hour); if (DateT.size()<2){DateT=Ztring(__T("0"))+Ztring::ToZtring(Hour);}
 Date+=DateT;
- Date+=_T(":");
- DateT=Ztring::ToZtring(Minute); if (DateT.size()<2){DateT=Ztring(_T("0"))+Ztring::ToZtring(Minute);}
+ Date+=__T(":");
+ DateT=Ztring::ToZtring(Minute); if (DateT.size()<2){DateT=Ztring(__T("0"))+Ztring::ToZtring(Minute);}
 Date+=DateT;
- Date+=_T(":");
- DateT.From_Number(Second); if (DateT.size()<2){DateT=Ztring(_T("0"))+Ztring::ToZtring(Second);}
+ Date+=__T(":");
+ DateT.From_Number(Second); if (DateT.size()<2){DateT=Ztring(__T("0"))+Ztring::ToZtring(Second);}
 Date+=DateT;
 assign (Date.c_str());
 return *this;
@@ -1287,112 +1547,77 @@
 std::string Ztring::To_UTF8 () const
 {
 #ifdef _UNICODE
- #ifdef ZENLIB_USEWX
- return wxConvUTF8.cWC2MB(c_str()).data();
- #else //ZENLIB_USEWX
- #ifdef WINDOWS
- if (IsWin9X())
- {
- std::string ToReturn;
- const wchar_t* Z=c_str();
- while (*Z) //0 is end
- {
- //1 byte
- if (*Z<0x80)
- ToReturn += (char) (*Z);
- else if (*Z<0x1000)
- {
- ToReturn += (char)(((*Z)>> 6)&0x1F);
- ToReturn += (char)( (*Z) &0x3F);
- }
- else
- break; //Bad character (or UTF-16LE, not yet supported)
- Z++;
- }
- return ToReturn;
- }
- else
- {
- int Size=WideCharToMultiByte(CP_UTF8, 0, c_str(), -1, NULL, 0, NULL, NULL);
- if (Size!=0)
- {
- char* AnsiString=new charSize+1;
- WideCharToMultiByte(CP_UTF8, 0, c_str(), -1, AnsiString, Size, NULL, NULL);
- AnsiStringSize='\0';
- std::string ToReturn(AnsiString);
- delete AnsiString; //AnsiString=NULL;
- return ToReturn;
- }
- else
- return std::string();
- }
- #else //WINDOWS
- //Correction thanks to Andrew Jang
- std::string ToReturn;
- ToReturn.reserve(size()); // more efficient
+ //Correction thanks to Andrew Jang
+ // Don't use WideCharToMultiByte(), some characters are not well converted
+ std::string ToReturn;
+ ToReturn.reserve(size()); // more efficient
 
- const wchar_t* Z=c_str();
+ const wchar_t* Z=c_str();
 
- while (*Z)
- {
- int32u wc; // must be unsigned.
-
- if (sizeof(wchar_t) == 2)
- wc = (int16u) *Z; // avoid a cast problem if wchar_t is signed.
- else
- wc = *Z;
-
- int count;
-
- // refer to http://en.wikipedia.org/wiki/UTF-8#Description
-
- if (wc < 0x80)
- count = 1;
- else if (wc < 0x800)
- count = 2;
- else if (wc < 0x10000)
- count = 3;
- else if (wc < 0x200000)
- count = 4;
- else if (wc < 0x4000000)
- count = 5;
- else if (wc <= 0x7fffffff)
- count = 6;
- else
- break; // bad character
+ while (*Z)
+ {
+ int32u wc; // must be unsigned.
+
+ #if defined(_MSC_VER)
+ #pragma warning(disable:4127)
+ #endif //defined(__VISUALC__)
+ if (sizeof(wchar_t) == 2)
+ #if defined(_MSC_VER)
+ #pragma warning(default:4127)
+ #endif //defined(__VISUALC__)
+ wc = (int16u) *Z; // avoid a cast problem if wchar_t is signed.
+ else
+ wc = *Z;
+
+ int count;
+
+ // refer to http://en.wikipedia.org/wiki/UTF-8#Description
+
+ if (wc < 0x80)
+ count = 1;
+ else if (wc < 0x800)
+ count = 2;
+ else if (wc < 0x10000)
+ count = 3;
+ else if (wc < 0x200000)
+ count = 4;
+ else if (wc < 0x4000000)
+ count = 5;
+ else if (wc <= 0x7fffffff)
+ count = 6;
+ else
+ break; // bad character
 
- int64u utfbuf = 0; // 8 bytes
- char* utf8chars = (char*) &utfbuf;
+ int64u utfbuf = 0; // 8 bytes
+ char* utf8chars = (char*) &utfbuf;
 
- switch (count)
- {
- case 6:
- utf8chars5 = 0x80 | (wc & 0x3f);
- wc = (wc >> 6) | 0x4000000;
- case 5:
- utf8chars4 = 0x80 | (wc & 0x3f);
- wc = (wc >> 6) | 0x200000;
- case 4:
- utf8chars3 = 0x80 | (wc & 0x3f);
- wc = (wc >> 6) | 0x10000;
- case 3:
- utf8chars2 = 0x80 | (wc & 0x3f);
- wc = (wc >> 6) | 0x800;
- case 2:
- utf8chars1 = 0x80 | (wc & 0x3f);
- wc = (wc >> 6) | 0xc0;
- case 1:
- utf8chars0 = wc;
- }
+ switch (count)
+ {
+ case 6:
+ utf8chars5 = 0x80 | (wc & 0x3f);
+ wc = (wc >> 6) | 0x4000000;
+ case 5:
+ utf8chars4 = 0x80 | (wc & 0x3f);
+ wc = (wc >> 6) | 0x200000;
+ case 4:
+ utf8chars3 = 0x80 | (wc & 0x3f);
+ wc = (wc >> 6) | 0x10000;
+ case 3:
+ utf8chars2 = 0x80 | (wc & 0x3f);
+ wc = (wc >> 6) | 0x800;
+ case 2:
+ utf8chars1 = 0x80 | (wc & 0x3f);
+ wc = (wc >> 6) | 0xc0;
+ case 1:
+ utf8chars0 = (char) wc;
+ }
 
- ToReturn += utf8chars;
+ ToReturn += utf8chars;
 
- ++Z;
- }
+ ++Z;
+ }
 
- return ToReturn;
- #endif
- #endif //ZENLIB_USEWX
+ return ToReturn;
 #else
 #ifdef ZENLIB_USEWX
 return wxConvUTF8.cWC2MB(wxConvCurrent->cMB2WC(c_str())).data();
@@ -1476,19 +1701,19 @@
 
 for (size_t Pos=0; Pos<36; Pos++)
 {
- if ((TempPos< _T('0') || TempPos> _T('9'))
- && (TempPos< _T('A') || TempPos> _T('F'))
- && (TempPos< _T('a') || TempPos> _T('f')))
+ if ((TempPos< __T('0') || TempPos> __T('9'))
+ && (TempPos< __T('A') || TempPos> __T('F'))
+ && (TempPos< __T('a') || TempPos> __T('f')))
 return 0;
- if (TempPos>=_T('A') && TempPos<=_T('F'))
+ if (TempPos>=__T('A') && TempPos<=__T('F'))
 {
- TempPos-=_T('A');
- TempPos+=_T('9')+1;
+ TempPos-=__T('A');
+ TempPos+=__T('9')+1;
 }
- if (TempPos>=_T('a') && TempPos<=_T('f'))
+ if (TempPos>=__T('a') && TempPos<=__T('f'))
 {
- TempPos-=_T('a');
- TempPos+=_T('9')+1;
+ TempPos-=__T('a');
+ TempPos+=__T('9')+1;
 }
 
 switch(Pos)
@@ -1497,12 +1722,12 @@
 case 12 :
 case 17 :
 case 22 :
- if (at(Pos+1)!=_T('-'))
+ if (at(Pos+1)!=__T('-'))
 return 0;
 Pos++; //Skipping dash in the test
 }
 }
- 
+
 int128u I;
 I.hi=((int64u)((int8u)(Temp 0-'0'))<<60)
 | ((int64u)((int8u)(Temp 1-'0'))<<56)
@@ -1562,10 +1787,10 @@
 
 //Conversion
 int I;
- #ifdef __MINGW32__
- I=_ttoi(c_str());
- #elif ( defined(__sun__) && !defined(__sparc__) ) || defined(__UCLIBC__)
- #ifdef UNICODE
+ #if defined(STREAM_MISSING)
+ #ifdef __MINGW32__
+ I=_ttoi(c_str());
+ #elif defined(UNICODE)
 std::string S=To_UTF8();
 I=atoi(S.c_str());
 #else //UNICODE
@@ -1579,7 +1804,7 @@
 #endif
 
 //Rounded
- if (Options==Ztring_Rounded && find(_T("."))!=Error)
+ if (Options==Ztring_Rounded && find(__T("."))!=Error)
 {
 float80 F=To_float80();
 F-=I;
@@ -1600,15 +1825,15 @@
 
 //Conversion
 unsigned int I;
- #ifdef __MINGW32__
- I=_ttoi64(c_str()); //TODO : I>0x7FFFFFFF - Replaced by i64 version to support, but not good
- #elif ( defined(__sun__) && !defined(__sparc__) ) || defined(__UCLIBC__)
- #ifdef UNICODE
+ #if defined(STREAM_MISSING)
+ #ifdef __MINGW32__
+ I=_ttoi64(c_str()); //TODO : I>0x7FFFFFFF - Replaced by i64 version to support, but not good
+ #elif defined(UNICODE)
 std::string S=To_UTF8();
 I=atoi(S.c_str());
- #else //UNICODE
+ #else //defined(UNICODE)
 I=atoi(c_str());
- #endif //UNICODE
+ #endif //defined(UNICODE)
 #else
 tStringStream SS(*this);
 SS >> setbase(Radix) >> I;
@@ -1617,7 +1842,7 @@
 #endif
 
 //Rounded
- if (Options==Ztring_Rounded && find(_T("."))!=std::string::npos)
+ if (Options==Ztring_Rounded && find(__T("."))!=std::string::npos)
 {
 float32 F=To_float32();
 F-=I;
@@ -1638,15 +1863,15 @@
 
 //Conversion
 int I;
- #ifdef __MINGW32__
- I=_ttoi(c_str());
- #elif ( defined(__sun__) && !defined(__sparc__) ) || defined(__UCLIBC__)
- #ifdef UNICODE
+ #if defined(STREAM_MISSING)
+ #ifdef __MINGW32__
+ I=_ttoi(c_str());
+ #elif defined(UNICODE)
 std::string S=To_UTF8();
 I=atoi(S.c_str());
- #else //UNICODE
+ #else //defined(UNICODE)
 I=atoi(c_str());
- #endif //UNICODE
+ #endif //defined(UNICODE)
 #else
 tStringStream SS(*this);
 SS >> setbase(Radix) >> I;
@@ -1655,7 +1880,7 @@
 #endif
 
 //Rounded
- if (Options==Ztring_Rounded && find(_T("."))!=Error)
+ if (Options==Ztring_Rounded && find(__T("."))!=Error)
 {
 float80 F=To_float80();
 F-=I;
@@ -1676,15 +1901,15 @@
 
 //Conversion
 unsigned int I;
- #ifdef __MINGW32__
- I=_ttoi64(c_str()); //TODO : I>0x7FFFFFFF - Replaced by i64 version to support, but not good
- #elif ( defined(__sun__) && !defined(__sparc__) ) || defined(__UCLIBC__)
- #ifdef UNICODE
+ #if defined(STREAM_MISSING)
+ #ifdef __MINGW32__
+ I=_ttoi64(c_str()); //TODO : I>0x7FFFFFFF - Replaced by i64 version to support, but not good
+ #elif defined(UNICODE)
 std::string S=To_UTF8();
 I=atoi(S.c_str());
- #else //UNICODE
+ #else //defined(UNICODE)
 I=atoi(c_str());
- #endif //UNICODE
+ #endif //defined(UNICODE)
 #else
 tStringStream SS(*this);
 SS >> setbase(Radix) >> I;
@@ -1693,7 +1918,7 @@
 #endif
 
 //Rounded
- if (Options==Ztring_Rounded && find(_T("."))!=std::string::npos)
+ if (Options==Ztring_Rounded && find(__T("."))!=std::string::npos)
 {
 float32 F=To_float32();
 F-=I;
@@ -1714,15 +1939,15 @@
 
 //Conversion
 int32s I;
- #ifdef __MINGW32__
- I=_ttoi(c_str());
- #elif ( defined(__sun__) && !defined(__sparc__) ) || defined(__UCLIBC__)
- #ifdef UNICODE
+ #if defined(STREAM_MISSING)
+ #ifdef __MINGW32__
+ I=_ttoi(c_str());
+ #elif defined(UNICODE)
 std::string S=To_UTF8();
 I=atol(S.c_str());
- #else //UNICODE
+ #else //defined(UNICODE)
 I=atol(c_str());
- #endif //UNICODE
+ #endif //defined(UNICODE)
 #else
 tStringStream SS(*this);
 SS >> setbase(Radix) >> I;
@@ -1731,7 +1956,7 @@
 #endif
 
 //Rounded
- if (Options==Ztring_Rounded && find(_T("."))!=Error)
+ if (Options==Ztring_Rounded && find(__T("."))!=Error)
 {
 float80 F=To_float80();
 F-=I;
@@ -1752,15 +1977,15 @@
 
 //Conversion
 int32u I;
- #ifdef __MINGW32__
- I=_ttoi64(c_str()); //TODO : I>0x7FFFFFFF - Replaced by i64 version to support, but not good
- #elif ( defined(__sun__) && !defined(__sparc__) ) || defined(__UCLIBC__)
- #ifdef UNICODE
+ #if defined(STREAM_MISSING)
+ #ifdef __MINGW32__
+ I=_ttoi64(c_str()); //TODO : I>0x7FFFFFFF - Replaced by i64 version to support, but not good
+ #elif defined(UNICODE)
 std::string S=To_UTF8();
 I=atol(S.c_str());
- #else //UNICODE
+ #else //defined(UNICODE)
 I=atol(c_str());
- #endif //UNICODE
+ #endif //defined(UNICODE)
 #else
 tStringStream SS(*this);
 SS >> setbase(Radix) >> I;
@@ -1769,7 +1994,7 @@
 #endif
 
 //Rounded
- if (Options==Ztring_Rounded && find(_T("."))!=std::string::npos)
+ if (Options==Ztring_Rounded && find(__T("."))!=std::string::npos)
 {
 float32 F=To_float32();
 F-=I;
@@ -1790,15 +2015,15 @@
 
 //Conversion
 int64s I;
- #ifdef __MINGW32__
- I=_ttoi64(c_str());
- #elif ( defined(__sun__) && !defined(__sparc__) ) || defined(__UCLIBC__)
- #ifdef UNICODE
- std::string S=To_UTF8();
+ #if defined(STREAM_MISSING)
+ #ifdef __MINGW32__
+ I=_ttoi64(c_str());
+ #elif defined(UNICODE)
+ std::string S=To_UTF8();
 I=atoll(S.c_str());
- #else //UNICODE
+ #else //defined(UNICODE)
 I=atoll(c_str());
- #endif //UNICODE
+ #endif //defined(UNICODE)
 #else
 tStringStream SS(*this);
 SS >> setbase(Radix) >> I;
@@ -1807,7 +2032,7 @@
 #endif
 
 //Rounded
- if (Options==Ztring_Rounded && find(_T("."))!=std::string::npos)
+ if (Options==Ztring_Rounded && find(__T("."))!=std::string::npos)
 {
 float32 F=To_float32();
 F-=I;
@@ -1828,15 +2053,15 @@
 
 //Conversion
 int64u I;
- #ifdef __MINGW32__
- I=_ttoi64(c_str()); //TODO : I>0x7FFFFFFFFFFFFFFF
- #elif ( defined(__sun__) && !defined(__sparc__) ) || defined(__UCLIBC__)
- #ifdef UNICODE
- std::string S=To_UTF8();
+ #if defined(STREAM_MISSING)
+ #ifdef __MINGW32__
+ I=_ttoi64(c_str()); //TODO : I>0x7FFFFFFFFFFFFFFF
+ #elif defined(UNICODE)
+ std::string S=To_UTF8();
 I=atoll(S.c_str());
- #else //UNICODE
+ #else //defined(UNICODE)
 I=atoll(c_str());
- #endif //UNICODE
+ #endif //defined(UNICODE)
 #else
 tStringStream SS(*this);
 SS >> setbase(Radix) >> I;
@@ -1845,7 +2070,7 @@
 #endif
 
 //Rounded
- if (Options==Ztring_Rounded && find(_T("."))!=std::string::npos)
+ if (Options==Ztring_Rounded && find(__T("."))!=std::string::npos)
 {
 float32 F=To_float32();
 F-=I;
@@ -1866,22 +2091,22 @@
 
 for (size_t Pos=0; Pos<32; Pos++)
 {
- if ((TempPos< _T('0') || TempPos> _T('9'))
- && (TempPos< _T('A') || TempPos> _T('F'))
- && (TempPos< _T('a') || TempPos> _T('f')))
+ if ((TempPos< __T('0') || TempPos> __T('9'))
+ && (TempPos< __T('A') || TempPos> __T('F'))
+ && (TempPos< __T('a') || TempPos> __T('f')))
 return 0;
- if (TempPos>=_T('A') && TempPos<=_T('F'))
+ if (TempPos>=__T('A') && TempPos<=__T('F'))
 {
- TempPos-=_T('A');
- TempPos+=_T('9')+1;
+ TempPos-=__T('A');
+ TempPos+=__T('9')+1;
 }
- if (TempPos>=_T('a') && TempPos<=_T('f'))
+ if (TempPos>=__T('a') && TempPos<=__T('f'))
 {
- TempPos-=_T('a');
- TempPos+=_T('9')+1;
+ TempPos-=__T('a');
+ TempPos+=__T('9')+1;
 }
 }
- 
+
 int128u I;
 I.hi=((int64u)((int8u)(Temp 0-'0'))<<60)
 | ((int64u)((int8u)(Temp 1-'0'))<<56)
@@ -1928,7 +2153,7 @@
 return 0;
 
 //Conversion
- #if defined(__MINGW32__) || ( defined(__sun__) && !defined(__sparc__) )
+ #if defined(STREAM_MISSING)
 #ifdef UNICODE
 return (wcstod(c_str(),NULL));
 #else
@@ -1954,7 +2179,7 @@
 return 0;
 
 //Conversion
- #if defined(__MINGW32__) || ( defined(__sun__) && !defined(__sparc__) )
+ #if defined(STREAM_MISSING)
 #ifdef UNICODE
 return (wcstod(c_str(),NULL)); //TODO verify no wcstold
 #else
@@ -1980,7 +2205,7 @@
 return 0;
 
 //Conversion
- #if defined(__MINGW32__) || ( defined(__sun__) && !defined(__sparc__) )
+ #if defined(STREAM_MISSING)
 #ifdef UNICODE
 return (wcstod(c_str(),NULL)); //TODO verify no wcstold
 #else
@@ -2057,7 +2282,7 @@
 bool OK=true;
 size_t Size=size();
 for (size_t Pos=0; Pos<Size; Pos++)
- if (operator(Pos)<_T('0') || operator(Pos)>_T('9'))
+ if (operator(Pos)<__T('0') || operator(Pos)>__T('9'))
 {
 OK=false;
 break;
@@ -2150,13 +2375,13 @@
 {
 int64s Left=To_int64s();
 int64s Right=ToCompare.To_int64s();
- if (Comparator==_T("==")) return (Left==Right);
- if (Comparator==_T("<")) return (Left< Right);
- if (Comparator==_T("<=")) return (Left<=Right);
- if (Comparator==_T(">=")) return (Left>=Right);
- if (Comparator==_T(">")) return (Left> Right);
- if (Comparator==_T("!=")) return (Left!=Right);
- if (Comparator==_T("<>")) return (Left!=Right);
+ if (Comparator==__T("==")) return (Left==Right);
+ if (Comparator==__T("<")) return (Left< Right);
+ if (Comparator==__T("<=")) return (Left<=Right);
+ if (Comparator==__T(">=")) return (Left>=Right);
+ if (Comparator==__T(">")) return (Left> Right);
+ if (Comparator==__T("!=")) return (Left!=Right);
+ if (Comparator==__T("<>")) return (Left!=Right);
 return false;
 }
 
@@ -2170,27 +2395,27 @@
 Right.MakeLowerCase();
 
 //string comparasion
- if (Comparator==_T("==")) return (Left==Right);
- if (Comparator==_T("IN")) {if (Left.find(Right)!=string::npos) return true; else return false;}
- if (Comparator==_T("<")) return (Left< Right);
- if (Comparator==_T("<=")) return (Left<=Right);
- if (Comparator==_T(">=")) return (Left>=Right);
- if (Comparator==_T(">")) return (Left> Right);
- if (Comparator==_T("!=")) return (Left!=Right);
- if (Comparator==_T("<>")) return (Left!=Right);
+ if (Comparator==__T("==")) return (Left==Right);
+ if (Comparator==__T("IN")) {if (Left.find(Right)!=string::npos) return true; else return false;}
+ if (Comparator==__T("<")) return (Left< Right);
+ if (Comparator==__T("<=")) return (Left<=Right);
+ if (Comparator==__T(">=")) return (Left>=Right);
+ if (Comparator==__T(">")) return (Left> Right);
+ if (Comparator==__T("!=")) return (Left!=Right);
+ if (Comparator==__T("<>")) return (Left!=Right);
 return false;
 }
 else
 {
 //string comparasion
- if (Comparator==_T("==")) return (*this==ToCompare);
- if (Comparator==_T("IN")) {if (this->find(ToCompare)!=string::npos) return true; else return false;}
- if (Comparator==_T("<")) return (*this< ToCompare);
- if (Comparator==_T("<=")) return (*this<=ToCompare);
- if (Comparator==_T(">=")) return (*this>=ToCompare);
- if (Comparator==_T(">")) return (*this> ToCompare);
- if (Comparator==_T("!=")) return (*this!=ToCompare);
- if (Comparator==_T("<>")) return (*this!=ToCompare);
+ if (Comparator==__T("==")) return (*this==ToCompare);
+ if (Comparator==__T("IN")) {if (this->find(ToCompare)!=string::npos) return true; else return false;}
+ if (Comparator==__T("<")) return (*this< ToCompare);
+ if (Comparator==__T("<=")) return (*this<=ToCompare);
+ if (Comparator==__T(">=")) return (*this>=ToCompare);
+ if (Comparator==__T(">")) return (*this> ToCompare);
+ if (Comparator==__T("!=")) return (*this!=ToCompare);
+ if (Comparator==__T("<>")) return (*this!=ToCompare);
 return false;
 }
 }

libzen_0.4.22.tar.bz2/Source/ZenLib/Ztring.h -> libzen_0.4.28.tar.bz2/Source/ZenLib/Ztring.h Changed

@@ -137,6 +137,13 @@
         /// @brief convert an ISO-8859-1 encoded string into Ztring
     Ztring& From_ISO_8859_1   (const char  *S, size_type Length)                {return From_ISO_8859_1(S, 0, Length);};
 
+        /// @brief convert an ISO-8859-2 encoded string into Ztring
+    Ztring& From_ISO_8859_2   (const char  *S);
+        /// @brief convert an ISO-8859-1 encoded string into Ztring
+    Ztring& From_ISO_8859_2   (const char  *S, size_type Start,  size_type Length);
+        /// @brief convert an ISO-8859-1 encoded string into Ztring
+    Ztring& From_ISO_8859_2   (const char  *S, size_type Length)                {return From_ISO_8859_2(S, 0, Length);};
+
         /// @brief convert an 16 byte GUID into Ztring
     Ztring& From_GUID    (const int128u S);
         /// @brief convert an 16 byte UUID into Ztring
@@ -189,10 +196,10 @@
     Ztring& From_Number  (const float64,  int8u AfterComma=3, ztring_t Options=Ztring_Nothing);
         /// @brief convert number into Ztring
     Ztring& From_Number  (const float80,  int8u AfterComma=3, ztring_t Options=Ztring_Nothing);
-    #ifdef NEED_SIZET
+    #ifdef SIZE_T_IS_LONG
         /// @brief convert number into Ztring
     Ztring& From_Number  (const size_t,   int8u Radix=10);
-    #endif //NEED_SIZET
+    #endif //SIZE_T_IS_LONG
         /// @brief convert number (BCD coded) into Ztring
     Ztring& From_BCD     (const int8u);
         /// @brief convert count of milliseconds into a readable and sortable string
@@ -307,9 +314,9 @@
     static Ztring ToZtring  (const float32  F, int8u AfterComma=3)               {return Ztring().From_Number(F, AfterComma);};
     static Ztring ToZtring  (const float64  F, int8u AfterComma=3)               {return Ztring().From_Number(F, AfterComma);};
     static Ztring ToZtring  (const float80  F, int8u AfterComma=3)               {return Ztring().From_Number(F, AfterComma);};
-    #ifdef NEED_SIZET
+    #ifdef SIZE_T_IS_LONG
     static Ztring ToZtring  (const size_t   I,  int8u Radix=10)                  {return Ztring().From_Number(I, Radix);};
-    #endif //NEED_SIZET
+    #endif //SIZE_T_IS_LONG
 
     //Edition
         /// @brief test if it is a number
@@ -319,13 +326,13 @@
         /// @brief convert into uppercase
     Ztring &MakeUpperCase();
         /// @brief Remove leading whitespaces from a string
-    Ztring &TrimLeft(Char ToTrim=_T(' '));
+    Ztring &TrimLeft(Char ToTrim=__T(' '));
         /// @brief Remove trailing whitespaces from a string
-    Ztring &TrimRight(Char ToTrim=_T(' '));
+    Ztring &TrimRight(Char ToTrim=__T(' '));
         /// @brief Remove leading and trailing whitespaces from a string
-    Ztring &Trim(Char ToTrim=_T(' '));
+    Ztring &Trim(Char ToTrim=__T(' '));
         /// @brief Quotes a string
-    Ztring &Quote(Char ToTrim=_T('\"'));
+    Ztring &Quote(Char ToTrim=__T('\"'));
         /// @brief return a string between two strings
         /// @param Begin First string
         /// @param End Second string
@@ -356,7 +363,7 @@
         /// @param Options Options for comaparing \n
         ///                Available : Ztring_CaseSensitive
         /// @return The result of comparasion
-    bool Compare (const Ztring &ToCompare, const Ztring &Comparator=_T("=="), ztring_t Options=Ztring_Nothing) const;
+    bool Compare (const Ztring &ToCompare, const Ztring &Comparator=__T("=="), ztring_t Options=Ztring_Nothing) const;
 };
 
 } //NameSpace

libzen_0.4.22.tar.bz2/Source/ZenLib/ZtringList.cpp -> libzen_0.4.28.tar.bz2/Source/ZenLib/ZtringList.cpp Changed

libzen_0.4.22.tar.bz2/Source/ZenLib/ZtringList.h -> libzen_0.4.28.tar.bz2/Source/ZenLib/ZtringList.h Changed

libzen_0.4.22.tar.bz2/Source/ZenLib/ZtringListList.cpp -> libzen_0.4.28.tar.bz2/Source/ZenLib/ZtringListList.cpp Changed

@@ -57,8 +57,8 @@
 : std::vector<ZenLib::ZtringList, std::allocator<ZenLib::ZtringList> > ()
 {
 Separator0=EOL;
- Separator1=_T(";");
- Quote=_T("\"");
+ Separator1=__T(";");
+ Quote=__T("\"");
 Max0=Error;
 Max1=Error;
 }
@@ -78,9 +78,9 @@
 
 ZtringListList::ZtringListList(const Ztring &Source)
 {
- Separator0=_T("\r\n");
- Separator1=_T(";");
- Quote=_T("\"");
+ Separator0=EOL;
+ Separator1=__T(";");
+ Quote=__T("\"");
 Max0=Error;
 Max1=Error;
 Write(Source.c_str());
@@ -88,9 +88,9 @@
 
 ZtringListList::ZtringListList(const Char *Source)
 {
- Separator0=_T("\r\n");
- Separator1=_T(";");
- Quote=_T("\"");
+ Separator0=EOL;
+ Separator1=__T(";");
+ Quote=__T("\"");
 Max0=Error;
 Max1=Error;
 Write(Source);
@@ -99,9 +99,9 @@
 #ifdef _UNICODE
 ZtringListList::ZtringListList (const char* S)
 {
- Separator0=_T("\r\n");
- Separator1=_T(";");
- Quote=_T("\"");
+ Separator0=EOL;
+ Separator1=__T(";");
+ Quote=__T("\"");
 Max0=Error;
 Max1=Error;
 Write(Ztring(S));
@@ -311,15 +311,38 @@
 ZL1.Quote_Set(Quote);
 ZL1.Max_Set(0, Max1);
 
+ //Detecting carriage return format
+ Ztring WriteSeparator;
+ if (Separator0==EOL)
+ {
+ size_t CarriageReturn_Pos=ToWrite.find_first_of(__T("\r\n"));
+ if (CarriageReturn_Pos!=string::npos)
+ {
+ if (ToWriteCarriageReturn_Pos==__T('\r'))
+ {
+ if (CarriageReturn_Pos+1<ToWrite.size() && ToWriteCarriageReturn_Pos+1==__T('\n'))
+ WriteSeparator=__T("\r\n");
+ else
+ WriteSeparator=__T("\r");
+ }
+ else
+ WriteSeparator=__T("\n");
+ }
+ else
+ WriteSeparator=Separator0;
+ }
+ else
+ WriteSeparator=Separator0;
+
 do
 {
 //Searching end of line, but it must not be in quotes
 bool InQuotes=false;
- Ztring CharsToFind=Separator0+Quote;
+ Ztring CharsToFind=WriteSeparator+Quote;
 size_t Pos_End=PosC;
 while (Pos_End<ToWrite.size())
 {
- Pos_End=ToWrite.find_first_of(CharsToFind, Pos_End);
+ Pos_End=ToWrite.find(WriteSeparator, Pos_End);
 if (Pos_End!=string::npos)
 {
 if (Pos_End+Quote.size()<ToWrite.size() && ToWritePos_End==Quote0 && ToWritePos_End+1!=Quote0)
@@ -327,17 +350,17 @@
 InQuotes=!InQuotes; //This is not double quotes, so this is a normal quote
 /*if (!InQuotes)
 {
- C1=ToWrite.substr(PosC, Pos_End-PosC); 
+ C1=ToWrite.substr(PosC, Pos_End-PosC);
 break;
 }*/
 }
 
- if (!InQuotes && Pos_End+Separator0.size()<=ToWrite.size() && ToWritePos_End==Separator00)
+ if (!InQuotes && Pos_End+WriteSeparator.size()<=ToWrite.size() && ToWritePos_End==WriteSeparator0)
 {
- C1=ToWrite.substr(PosC, Pos_End-PosC); 
+ C1=ToWrite.substr(PosC, Pos_End-PosC);
 break;
 }
- 
+
 if (InQuotes && Pos_End+Quote.size()*2<ToWrite.size() && ToWritePos_End==Quote0 && ToWritePos_End+1==Quote0)
 Pos_End+=2;
 else
@@ -349,7 +372,7 @@
 
 ZL1.Write(C1);
 push_back(ZL1);
- PosC+=C1.size()+Separator0.size();
+ PosC+=C1.size()+WriteSeparator.size();
 if (PosC>=ToWrite.size())
 Fini=true;
 }

libzen_0.4.22.tar.bz2/Source/ZenLib/ZtringListList.h -> libzen_0.4.28.tar.bz2/Source/ZenLib/ZtringListList.h Changed

@@ -101,7 +101,7 @@
     /// @brief Delete a vector of string at position Pos0
     void Delete (size_type Pos0)                                                   {erase(begin()+Pos0);};
     /// @brief Delete all vectors of string, with xxxPos1 == ToFind
-    void Delete (const Ztring &ToFind, size_type Pos1=0, const Ztring &Comparator=_T("=="), ztring_t Options=Ztring_Nothing);
+    void Delete (const Ztring &ToFind, size_type Pos1=0, const Ztring &Comparator=__T("=="), ztring_t Options=Ztring_Nothing);
     /// @brief Delete a string at all positions Pos1
     void Delete1 (size_type Pos1);
 
@@ -121,9 +121,9 @@
     /// @brief Find the first position of the string in the vector of vector, in a specific column
     size_type Find (const Ztring &ToFind, size_type Pos1, size_type Pos0Begin, const Ztring &Comparator, ztring_t Options=Ztring_Nothing) const;
     /// @brief Return xxxPos1Value when founded the first position of the string in the vector of vector, in a specific column
-    Ztring FindValue (const Ztring &ToFind, size_type Pos1Value=1, size_type Pos1=0, size_type Pos0Begin=0, const Ztring &Comparator=_T("=="), ztring_t Options=Ztring_Nothing) const;
+    Ztring FindValue (const Ztring &ToFind, size_type Pos1Value=1, size_type Pos1=0, size_type Pos0Begin=0, const Ztring &Comparator=__T("=="), ztring_t Options=Ztring_Nothing) const;
     /// @brief Return a subsheet, with all lines with position of the string in the vector of vector, in a specific column
-    ZtringListList SubSheet (const Ztring &ToFind, size_type Pos1=0, size_type Pos0Begin=0, const Ztring &Comparator=_T("=="), ztring_t Options=Ztring_Nothing) const;
+    ZtringListList SubSheet (const Ztring &ToFind, size_type Pos1=0, size_type Pos0Begin=0, const Ztring &Comparator=__T("=="), ztring_t Options=Ztring_Nothing) const;
 
     //Configuration
     /// @brief Set the Separator character

libzen_0.4.22.tar.bz2/Source/ZenLib/ZtringListListF.cpp -> libzen_0.4.28.tar.bz2/Source/ZenLib/ZtringListListF.cpp Changed

@@ -110,9 +110,9 @@
 
 size_t I1=Error;
 
- if (Name.find(_T(".csv"))!=Error)
+ if (Name.find(__T(".csv"))!=Error)
 I1=CSV_Charger();
- if (Name.find(_T(".cfg"))!=Error)
+ if (Name.find(__T(".cfg"))!=Error)
 I1=CFG_Charger();
 if (I1!=Error)
 {
@@ -128,7 +128,10 @@
 bool ZtringListListF::CSV_Charger ()
 {
 //Read file
- File F(Name);
+ File F;
+ if (!F.Open(Name))
+ return false;
+
 int8u* Buffer=new int8u(size_t)F.Size_Get()+1;
 size_t BytesCount=F.Read(Buffer, (size_t)F.Size_Get());
 F.Close();
@@ -155,10 +158,10 @@
 File.From_Local((char*)Buffer, 0, BytesCount);
 
 //Separators
- if (Separator0==_T("(Default)"))
+ if (Separator0==__T("(Default)"))
 Separator0=EOL;
 Ztring SeparatorT=Separator1;
- Separator1=_T(";");
+ Separator1=__T(";");
 
 //Writing
 Write(File);
@@ -194,27 +197,27 @@
 List.Write(Z1);
 
 Ztring SeparatorT=Separator1;
- Separator1=_T(";");
+ Separator1=__T(";");
 
 Ztring Propriete, Valeur, Commentaire;
 
 for (size_t Pos=0; Pos<List.size(); Pos++)
 {
 Ztring &Lu=List(Pos);
- if (Lu.find(_T("="))>0)
+ if (Lu.find(__T("="))>0)
 {
 //Obtention du Name
- Propriete=Lu.SubString(Ztring(), _T("="));
+ Propriete=Lu.SubString(Ztring(), __T("="));
 NettoyerEspaces(Propriete);
 //Obtention de la valeur
- Valeur=Lu.SubString(_T("="), _T(";"), 0, Ztring_AddLastItem);
+ Valeur=Lu.SubString(__T("="), __T(";"), 0, Ztring_AddLastItem);
 NettoyerEspaces(Valeur);
 }
 //Obtention du commentaire
- Commentaire=Lu.SubString(_T(";"), Ztring(), 0, Ztring_AddLastItem);
+ Commentaire=Lu.SubString(__T(";"), Ztring(), 0, Ztring_AddLastItem);
 NettoyerEspaces(Commentaire);
 //Ecriture
- push_back((Propriete+_T(";")+Valeur+_T(";")+Commentaire).c_str()); //Visual C++ 6 is old...
+ push_back((Propriete+__T(";")+Valeur+__T(";")+Commentaire).c_str()); //Visual C++ 6 is old...
 }
 Separator1=SeparatorT;
 
@@ -242,23 +245,23 @@
 //TODO : not tested
 for (int8u I1=Backup_Nb_Max-1; I1>0; I1--)
 {
- Ztring Z1=Name+_T(".sav"); Z1+=Ztring::ToZtring(I1);
- Ztring Z2=Name+_T(".sav"); Z2+=Ztring::ToZtring(I1+1);
+ Ztring Z1=Name+__T(".sav"); Z1+=Ztring::ToZtring(I1);
+ Ztring Z2=Name+__T(".sav"); Z2+=Ztring::ToZtring(I1+1);
 File::Delete(Z2.c_str());
 I2=File::Move(Z1.c_str(), Z2.c_str());
 if (I2 && !Backup_Nb)
 Backup_Nb=I2;
 }
- Ztring Z1=Name+_T(".sav0");
+ Ztring Z1=Name+__T(".sav0");
 File::Delete(Z1.c_str());
 File::Move(Name.c_str(), Z1.c_str());
 Backup_Nb++;
 }
 
 I2=0;
- if (Name.find(_T(".csv"))!=Error)
+ if (Name.find(__T(".csv"))!=Error)
 I2=CSV_Sauvegarder();
- if (Name.find(_T(".cfg"))!=Error)
+ if (Name.find(__T(".cfg"))!=Error)
 I2=CFG_Sauvegarder();
 
 if (I2>0)
@@ -278,7 +281,7 @@
 if (!F.Create(Name, true))
 return Error;
 
- if (Separator0==_T("(Default)"))
+ if (Separator0==__T("(Default)"))
 Separator0=EOL;
 
 F.Write(Read());
@@ -305,12 +308,12 @@
 Commentaire=Read(Pos, 2);
 if (Propriete!=Ztring())
 {
- ToWrite+=Propriete+_T(" = ");
+ ToWrite+=Propriete+__T(" = ");
 if (Valeur!=Ztring())
- ToWrite+=Valeur+_T(" ");
+ ToWrite+=Valeur+__T(" ");
 }
 if (Commentaire!=Ztring())
- ToWrite+=_T("; ")+Commentaire;
+ ToWrite+=__T("; ")+Commentaire;
 ToWrite+=EOL;
 }
 F.Write(ToWrite);
@@ -322,13 +325,13 @@
 // Annulation
 bool ZtringListListF::Cancel ()
 {
- Ztring Z1=Name+_T(".sav0"); //Visual C++ 6 patch
+ Ztring Z1=Name+__T(".sav0"); //Visual C++ 6 patch
 File::Delete(Name.c_str());
 File::Move(Z1.c_str(), Name.c_str());
 for (int8u I1=1; I1<=Backup_Nb; I1++)
 {
- Ztring Z2=Name+_T(".sav"); Z2+=Ztring::ToZtring(I1); //Visual C++ 6 patch
- Ztring Z3=Name+_T(".sav"); Z3+=Ztring::ToZtring(I1-1); //Visual C++ 6 patch
+ Ztring Z2=Name+__T(".sav"); Z2+=Ztring::ToZtring(I1); //Visual C++ 6 patch
+ Ztring Z3=Name+__T(".sav"); Z3+=Ztring::ToZtring(I1-1); //Visual C++ 6 patch
 File::Delete(Z3.c_str());
 File::Move(Z2.c_str(), Z3.c_str());
 }
@@ -345,10 +348,10 @@
 bool ZtringListListF::NettoyerEspaces (Ztring &ANettoyer)
 {
 size_t Debut=0;
- while (Debut<ANettoyer.size() && ANettoyerDebut==_T(' '))
+ while (Debut<ANettoyer.size() && ANettoyerDebut==__T(' '))
 Debut++;
 size_t Fin=ANettoyer.size()-1;
- while (Fin!=(size_t)-2 && ANettoyerFin==_T(' '))
+ while (Fin!=(size_t)-2 && ANettoyerFin==__T(' '))
 Fin--;
 if (Fin>=Debut)
 ANettoyer=ANettoyer.substr(Debut, Fin-Debut+1);

libzen_0.4.22.tar.bz2/Source/ZenLib/int128s.cpp -> libzen_0.4.28.tar.bz2/Source/ZenLib/int128s.cpp Changed

libzen_0.4.22.tar.bz2/Source/ZenLib/int128u.cpp -> libzen_0.4.28.tar.bz2/Source/ZenLib/int128u.cpp Changed

libzen_0.4.22.tar.bz2/debian/changelog -> libzen_0.4.28.tar.bz2/debian/changelog Changed

libzen_0.4.22.tar.bz2/debian/control -> libzen_0.4.28.tar.bz2/debian/control Changed

libzen_0.4.22.tar.bz2/debian/copyright -> libzen_0.4.28.tar.bz2/debian/copyright Changed

libzen_0.4.28.tar.bz2/debian/libzen-dev.dirs Added

libzen_0.4.28.tar.bz2/debian/libzen-dev.install Added

libzen_0.4.22.tar.bz2/debian/rules -> libzen_0.4.28.tar.bz2/debian/rules Changed

@@ -22,7 +22,7 @@
 	cp Source/Doc/*.html ./
 	cd Project/GNU/Library && chmod u+x autogen
 	cd Project/GNU/Library && ./autogen
-	cd Project/GNU/Library && ./configure --enable-shared --prefix=/usr --disable-all
+	cd Project/GNU/Library && ./configure --disable-static --enable-shared --prefix=/usr
 
 	touch $@
 
@@ -55,16 +55,12 @@
 	cd Project/GNU/Library && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 	install -dm 755 $(CURDIR)/debian/tmp/usr/include/ZenLib
 	install -m 644 Source/ZenLib/*.h $(CURDIR)/debian/tmp/usr/include/ZenLib
-	install -dm 755 $(CURDIR)/debian/tmp/usr/include/ZenLib/Base64
-	install -m 644 Source/ZenLib/Base64/*.h $(CURDIR)/debian/tmp/usr/include/ZenLib/Base64
 	install -dm 755 $(CURDIR)/debian/tmp/usr/include/ZenLib/HTTP_Client
 	install -m 644 Source/ZenLib/HTTP_Client/*.h $(CURDIR)/debian/tmp/usr/include/ZenLib/HTTP_Client
 	install -dm 755 $(CURDIR)/debian/tmp/usr/include/ZenLib/Format/Html
 	install -m 644 Source/ZenLib/Format/Html/*.h $(CURDIR)/debian/tmp/usr/include/ZenLib/Format/Html
 	install -dm 755 $(CURDIR)/debian/tmp/usr/include/ZenLib/Format/Http
 	install -m 644 Source/ZenLib/Format/Http/*.h $(CURDIR)/debian/tmp/usr/include/ZenLib/Format/Http
-	install -dm 755 $(CURDIR)/debian/tmp/usr/include/ZenLib/TinyXml
-	install -m 644 Source/ZenLib/TinyXml/*.h $(CURDIR)/debian/tmp/usr/include/ZenLib/TinyXml
 
 	sed -i -e 's|Version: |Version: %{version}|g' Project/GNU/Library/libzen.pc
 	install -dm 755 $(CURDIR)/debian/tmp/usr/lib/pkgconfig
@@ -72,12 +68,12 @@
 
 	install -dm 755 $(CURDIR)/debian/tmp/usr/share/doc/libzen0
 	install -m 644 *.txt $(CURDIR)/debian/tmp/usr/share/doc/libzen0
-	install -dm 755 $(CURDIR)/debian/tmp/usr/share/doc/libzen0-dev
-	install -m 644 Documentation.html $(CURDIR)/debian/tmp/usr/share/doc/libzen0-dev
-	install -dm 755 $(CURDIR)/debian/tmp/usr/share/doc/libzen0-dev/Doc
-	install -m 644 Doc/*.* $(CURDIR)/debian/tmp/usr/share/doc/libzen0-dev/Doc
-	if test -d Doc/search/ ; then install -dm 755 $(CURDIR)/debian/tmp/usr/share/doc/libzen0-dev/Doc/search ; fi
-	if test -d Doc/search/ ; then install -m 644 Doc/search/*.* $(CURDIR)/debian/tmp/usr/share/doc/libzen0-dev/Doc/search ; fi
+	install -dm 755 $(CURDIR)/debian/tmp/usr/share/doc/libzen-dev
+	install -m 644 Documentation.html $(CURDIR)/debian/tmp/usr/share/doc/libzen-dev
+	install -dm 755 $(CURDIR)/debian/tmp/usr/share/doc/libzen-dev/Doc
+	install -m 644 Doc/*.* $(CURDIR)/debian/tmp/usr/share/doc/libzen-dev/Doc
+	if test -d Doc/search/ ; then install -dm 755 $(CURDIR)/debian/tmp/usr/share/doc/libzen-dev/Doc/search ; fi
+	if test -d Doc/search/ ; then install -m 644 Doc/search/*.* $(CURDIR)/debian/tmp/usr/share/doc/libzen-dev/Doc/search ; fi
 
 
 # Build architecture-independent files here.

Build Results
RPM Lint

Refresh

Comments for request 284 0

Request History

marguerite created request over 11 years ago

bump version 0.4.28

pbleser accepted request about 12 years ago