Permalink
Browse files

Removed easyzlib.c

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
  • Loading branch information...
1 parent 990b65d commit 645243028271104891a324784e71c549bd6f32dd @FellowTraveler committed Dec 6, 2013
View
@@ -707,7 +707,7 @@ EXCLUDE_SYMLINKS = NO
# against the file with absolute path, so to exclude all test directories
# for example use the pattern */test/*
-EXCLUDE_PATTERNS = *.pb.* tinythread.* fast_mutex.* anyoption.* stacktrace.* */simpleini/* easyzlib.* ExportWrapper.* WinsockWrapper.* otapicli.* test*.* irrXML.*
+EXCLUDE_PATTERNS = *.pb.* tinythread.* fast_mutex.* anyoption.* stacktrace.* */simpleini/* ExportWrapper.* WinsockWrapper.* otapicli.* test*.* irrXML.*
# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
# (namespaces, classes, functions, etc.) that should be excluded from the
@@ -827,29 +827,14 @@ Paul C. Sutton paul@openssl.org paul@awe.com UK
*/
-
-/*********************************************************************
- * easyzlib release 1.0 --- (Compression)
- *
- * Copyright (C) 2008 First Objective Software, Inc. (Used with
- * permission.)
- *
- * This entire notice must be retained in this source code
- * Redistributing this source code requires written permission
- * This software is provided "as is", with no warranty.
- *
- * Latest fixes enhancements and documentation at www.firstobject.com
- **********************************************************************/
-
-
/***********************************************************************
* ZLIB
*
* (Open Transactions does not actually contain the zlib code, but
- * merely links to it via easyzlib. Nevertheless, these credits are
- * provided in respect of the people who worked on the project.)
+ * merely links to it. Nevertheless, these credits are provided in
+ * respect of the people who worked on the project.)
*
*
* 'zlib' general purpose compression library
View
@@ -1,107 +0,0 @@
-/* easyzlib.h header
-
- easyzlib release 1.0
- Copyright (C) 2008 First Objective Software, Inc. All rights reserved
- This entire notice must be retained in this source code
- Redistributing this source code requires written permission
- This software is provided "as is", with no warranty.
- Latest fixes enhancements and documentation at www.firstobject.com
-*/
-
-#ifndef _EASYZLIB_H
-#define _EASYZLIB_H
-
-/* Return codes */
-#define EZ_STREAM_ERROR (-2)
-#define EZ_DATA_ERROR (-3)
-#define EZ_MEM_ERROR (-4)
-#define EZ_BUF_ERROR (-5)
-
-/* Calculate maximum compressed length from uncompressed length */
-#define EZ_COMPRESSMAXDESTLENGTH(n) (n+(((n)/1000)+1)+12)
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-int ezcompress( unsigned char* pDest, long* pnDestLen, const unsigned char* pSrc, long nSrcLen );
-int ezuncompress( unsigned char* pDest, long* pnDestLen, const unsigned char* pSrc, long nSrcLen );
-
-#ifdef __cplusplus
-}
-
-struct ezbuffer
-{
- ezbuffer() { Init(); };
- ezbuffer( int n ) { Init(); Alloc(n); };
- ~ezbuffer() { Release(); };
- unsigned char* Alloc( int n ) { if (nSize<n) {Release(); pBuf=new unsigned char[n]; nSize = n;} nLen=n; return pBuf; };
- void Release() { if (pBuf) { delete[] pBuf; Init(); } };
- unsigned char* pBuf;
- long nLen; /* data length */
-private:
- void Init() { pBuf = NULL; nSize=0; nLen=0; };
- long nSize; /* bytes allocated */
-};
-
-#define EZ_CHECKLENGTH 8192
-
-int ezcompress( ezbuffer& bufDest, const ezbuffer& bufSrc )
-{
- if ( bufDest.nLen == 0 )
- bufDest.Alloc( EZ_CHECKLENGTH );
- int nErr = ezcompress( bufDest.pBuf, &bufDest.nLen, bufSrc.pBuf, bufSrc.nLen );
- if ( nErr == EZ_BUF_ERROR )
- {
- bufDest.Alloc( bufDest.nLen );
- nErr = ezcompress( bufDest.pBuf, &bufDest.nLen, bufSrc.pBuf, bufSrc.nLen );
- }
- return nErr;
-};
-
-int ezuncompress( ezbuffer& bufDest, const ezbuffer& bufSrc )
-{
- if ( bufDest.nLen == 0 )
- bufDest.Alloc( EZ_CHECKLENGTH );
- int nErr = ezuncompress( bufDest.pBuf, &bufDest.nLen, bufSrc.pBuf, bufSrc.nLen );
- if ( nErr == EZ_BUF_ERROR )
- {
- bufDest.Alloc( bufDest.nLen );
- nErr = ezuncompress( bufDest.pBuf, &bufDest.nLen, bufSrc.pBuf, bufSrc.nLen );
- }
- return nErr;
-};
-
-#ifdef MCD_STR
-/* CMarkup designated string class and macros */
-
-int ezcompress( ezbuffer& bufDest, const MCD_STR& strSrc )
-{
- int nSrcLen = MCD_STRLENGTH(strSrc) * sizeof(MCD_CHAR);
- /* alternatively: bufDest.Alloc( EZ_COMPRESSMAXDESTLENGTH(nSrcLen) ); // >.1% + 12 */
- unsigned char pTempDest[EZ_CHECKLENGTH];
- long nTempLen = EZ_CHECKLENGTH;
- int nErr = ezcompress( pTempDest, &nTempLen, (const unsigned char*)MCD_2PCSZ(strSrc), nSrcLen );
- bufDest.Alloc( nTempLen );
- nErr = ezcompress( bufDest.pBuf, &bufDest.nLen, (const unsigned char*)MCD_2PCSZ(strSrc), nSrcLen );
- return nErr;
-}
-
-int ezuncompress( MCD_STR& strDest, const ezbuffer& bufSrc )
-{
- unsigned char pTempDest[EZ_CHECKLENGTH];
- long nTempLen = EZ_CHECKLENGTH;
- int nErr = ezuncompress( pTempDest, &nTempLen, bufSrc.pBuf, bufSrc.nLen );
- int nDestStrLen = nTempLen / sizeof(MCD_CHAR);
- MCD_CHAR* p = MCD_GETBUFFER(strDest,nDestStrLen);
- nErr = ezuncompress( (unsigned char*)p, &nTempLen, bufSrc.pBuf, bufSrc.nLen );
- MCD_RELEASEBUFFER(strDest,p,nDestStrLen);
- return nErr;
-}
-
-#endif /* MCD_STR */
-
-#endif /* __cplusplus */
-
-#endif /* _EASYZLIB_H */
@@ -22,7 +22,6 @@
<ClInclude Include="..\..\include\otlib\anyoption.h" />
<ClInclude Include="..\..\include\otlib\Bitcoin.pb.h" />
<ClInclude Include="..\..\include\otlib\constants.h" />
- <ClInclude Include="..\..\include\otlib\easyzlib.h" />
<ClInclude Include="..\..\include\otlib\ExportWrapper.h" />
<ClInclude Include="..\..\include\otlib\fast_mutex.h" />
<ClInclude Include="..\..\include\otlib\Generics.pb.h" />
@@ -251,12 +250,6 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_UNICODE;UNICODE; _CRT_SECURE_NO_WARNINGS; _DEBUG;DEBUG;_WIN64;_AMD64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_UNICODE;UNICODE; _CRT_SECURE_NO_WARNINGS; _WIN64;_AMD64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\otlib\otext\easyzlib.c">
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
- </ClCompile>
<ClCompile Include="..\..\src\otlib\otext\mkcert.cpp" />
<ClCompile Include="..\..\src\otlib\otext\Timer.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
@@ -21,9 +21,6 @@
<ClInclude Include="..\..\include\otlib\Bitcoin.pb.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\include\otlib\easyzlib.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\include\otlib\Generics.pb.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -404,9 +401,6 @@
<ClCompile Include="..\..\src\otlib\Moneychanger.pb.cc">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\src\otlib\otext\easyzlib.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\src\otlib\otext\anyoption.cpp">
<Filter>Source Files</Filter>
</ClCompile>
View
@@ -120,7 +120,6 @@ otlib_headers_dir = $(opentxs_include_dir)/otlib
otlib_headers = $(otlib_headers_dir)/constants.h \
$(otlib_headers_dir)/fast_mutex.h \
$(otlib_headers_dir)/WinsockWrapper.h \
- $(otlib_headers_dir)/easyzlib.h \
$(otlib_headers_dir)/tinythread.h \
$(otlib_headers_dir)/Timer.h \
$(otlib_headers_ext)
Oops, something went wrong.

0 comments on commit 6452430

Please sign in to comment.