diff options
author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2010-06-04 04:00:00 +0400 |
---|---|---|
committer | Kornel LesiĆski <kornel@geekhood.net> | 2016-05-28 02:16:03 +0300 |
commit | 708873490ee36691d84cc06336aac87c5129f8a0 (patch) | |
tree | bbe6e5aa922a158e5810c1a2ff7c78927cc6d973 /C | |
parent | 3dacb5eb8afda99aad81f4723cb966c0fa91ba1d (diff) |
9.149.14
Diffstat (limited to 'C')
-rwxr-xr-x | C/7zVersion.h | 6 | ||||
-rwxr-xr-x | C/Bra.c | 6 | ||||
-rwxr-xr-x | C/CpuArch.h | 7 | ||||
-rwxr-xr-x | C/Lzma2Enc.c | 4 | ||||
-rwxr-xr-x | C/LzmaEnc.c | 4 | ||||
-rwxr-xr-x | C/Ppmd8Dec.c | 4 | ||||
-rwxr-xr-x | C/Ppmd8Enc.c | 4 | ||||
-rwxr-xr-x | C/Types.h | 4 | ||||
-rwxr-xr-x | C/XzCrc64.c | 4 | ||||
-rwxr-xr-x | C/XzCrc64.h | 16 | ||||
-rwxr-xr-x | C/XzDec.c | 4 |
11 files changed, 34 insertions, 29 deletions
diff --git a/C/7zVersion.h b/C/7zVersion.h index c7f19bd1..5faf2003 100755 --- a/C/7zVersion.h +++ b/C/7zVersion.h @@ -1,7 +1,7 @@ #define MY_VER_MAJOR 9 -#define MY_VER_MINOR 13 +#define MY_VER_MINOR 14 #define MY_VER_BUILD 0 -#define MY_VERSION "9.13 beta" -#define MY_DATE "2010-04-15" +#define MY_VERSION "9.14 beta" +#define MY_DATE "2010-06-04" #define MY_COPYRIGHT ": Igor Pavlov : Public domain" #define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " : " MY_DATE @@ -1,5 +1,5 @@ /* Bra.c -- Converters for RISC code -2008-10-04 : Igor Pavlov : Public domain */ +2010-04-16 : Igor Pavlov : Public domain */ #include "Bra.h" @@ -104,8 +104,8 @@ SizeT SPARC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding) size -= 4; for (i = 0; i <= size; i += 4) { - if (data[i] == 0x40 && (data[i + 1] & 0xC0) == 0x00 || - data[i] == 0x7F && (data[i + 1] & 0xC0) == 0xC0) + if ((data[i] == 0x40 && (data[i + 1] & 0xC0) == 0x00) || + (data[i] == 0x7F && (data[i + 1] & 0xC0) == 0xC0)) { UInt32 src = ((UInt32)data[i + 0] << 24) | diff --git a/C/CpuArch.h b/C/CpuArch.h index b3e91f53..aec3c416 100755 --- a/C/CpuArch.h +++ b/C/CpuArch.h @@ -1,5 +1,5 @@ /* CpuArch.h -- CPU specific code -2010-03-11: Igor Pavlov : Public domain */ +2010-05-20: Igor Pavlov : Public domain */ #ifndef __CPU_ARCH_H #define __CPU_ARCH_H @@ -55,6 +55,7 @@ If MY_CPU_LE_UNALIGN is not defined, we don't know about these properties of pla #define GetUi64(p) (*(const UInt64 *)(p)) #define SetUi16(p, d) *(UInt16 *)(p) = (d); #define SetUi32(p, d) *(UInt32 *)(p) = (d); +#define SetUi64(p, d) *(UInt64 *)(p) = (d); #else @@ -78,6 +79,10 @@ If MY_CPU_LE_UNALIGN is not defined, we don't know about these properties of pla ((Byte *)(p))[2] = (Byte)(_x_ >> 16); \ ((Byte *)(p))[3] = (Byte)(_x_ >> 24); } +#define SetUi64(p, d) { UInt64 _x64_ = (d); \ + SetUi32(p, (UInt32)_x64_); \ + SetUi32(((Byte *)(p)) + 4, (UInt32)(_x64_ >> 32)); } + #endif #if defined(MY_CPU_LE_UNALIGN) && defined(_WIN64) && (_MSC_VER >= 1300) diff --git a/C/Lzma2Enc.c b/C/Lzma2Enc.c index f9328b56..26109309 100755 --- a/C/Lzma2Enc.c +++ b/C/Lzma2Enc.c @@ -1,5 +1,5 @@ /* Lzma2Enc.c -- LZMA2 Encoder -2010-03-25 : Igor Pavlov : Public domain */ +2010-04-16 : Igor Pavlov : Public domain */ /* #include <stdio.h> */ #include <string.h> @@ -141,7 +141,7 @@ static SRes Lzma2EncInt_EncodeSubblock(CLzma2EncInt *p, Byte *outBuf, PRF(printf(" ")); - outBuf[destPos++] = (Byte)(LZMA2_CONTROL_LZMA | (mode << 5) | (u >> 16) & 0x1F); + outBuf[destPos++] = (Byte)(LZMA2_CONTROL_LZMA | (mode << 5) | ((u >> 16) & 0x1F)); outBuf[destPos++] = (Byte)(u >> 8); outBuf[destPos++] = (Byte)u; outBuf[destPos++] = (Byte)(pm >> 8); diff --git a/C/LzmaEnc.c b/C/LzmaEnc.c index 169d4f46..cf131388 100755 --- a/C/LzmaEnc.c +++ b/C/LzmaEnc.c @@ -1,5 +1,5 @@ /* LzmaEnc.c -- LZMA Encoder -2009-11-24 : Igor Pavlov : Public domain */ +2010-04-16 : Igor Pavlov : Public domain */ #include <string.h> @@ -395,7 +395,7 @@ SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2) LzmaEncProps_Normalize(&props); if (props.lc > LZMA_LC_MAX || props.lp > LZMA_LP_MAX || props.pb > LZMA_PB_MAX || - props.dictSize > (1 << kDicLogSizeMaxCompress) || props.dictSize > (1 << 30)) + props.dictSize > ((UInt32)1 << kDicLogSizeMaxCompress) || props.dictSize > ((UInt32)1 << 30)) return SZ_ERROR_PARAM; p->dictSize = props.dictSize; p->matchFinderCycles = props.mc; diff --git a/C/Ppmd8Dec.c b/C/Ppmd8Dec.c index f89f58f0..c54e02ab 100755 --- a/C/Ppmd8Dec.c +++ b/C/Ppmd8Dec.c @@ -1,5 +1,5 @@ /* Ppmd8Dec.c -- PPMdI Decoder -2010-03-12 : Igor Pavlov : Public domain +2010-04-16 : Igor Pavlov : Public domain This code is based on: PPMd var.I (2002): Dmitry Shkarin : Public domain Carryless rangecoder (1999): Dmitry Subbotin : Public domain */ @@ -33,7 +33,7 @@ static void RangeDec_Decode(CPpmd8 *p, UInt32 start, UInt32 size) p->Range *= size; while ((p->Low ^ (p->Low + p->Range)) < kTop || - p->Range < kBot && ((p->Range = (0 - p->Low) & (kBot - 1)), 1)) + (p->Range < kBot && ((p->Range = (0 - p->Low) & (kBot - 1)), 1))) { p->Code = (p->Code << 8) | p->Stream.In->Read(p->Stream.In); p->Range <<= 8; diff --git a/C/Ppmd8Enc.c b/C/Ppmd8Enc.c index 14a326cf..8da727eb 100755 --- a/C/Ppmd8Enc.c +++ b/C/Ppmd8Enc.c @@ -1,5 +1,5 @@ /* Ppmd8Enc.c -- PPMdI Encoder -2010-03-12 : Igor Pavlov : Public domain +2010-04-16 : Igor Pavlov : Public domain This code is based on: PPMd var.I (2002): Dmitry Shkarin : Public domain Carryless rangecoder (1999): Dmitry Subbotin : Public domain */ @@ -19,7 +19,7 @@ void Ppmd8_RangeEnc_FlushData(CPpmd8 *p) static void RangeEnc_Normalize(CPpmd8 *p) { while ((p->Low ^ (p->Low + p->Range)) < kTop || - p->Range < kBot && ((p->Range = (0 - p->Low) & (kBot - 1)), 1)) + (p->Range < kBot && ((p->Range = (0 - p->Low) & (kBot - 1)), 1))) { p->Stream.Out->Write(p->Stream.Out, (Byte)(p->Low >> 24)); p->Range <<= 8; @@ -1,5 +1,5 @@ /* Types.h -- Basic types -2010-03-11 : Igor Pavlov : Public domain */ +2010-04-16 : Igor Pavlov : Public domain */ #ifndef __7Z_TYPES_H #define __7Z_TYPES_H @@ -77,9 +77,11 @@ typedef unsigned long UInt64; #if defined(_MSC_VER) || defined(__BORLANDC__) typedef __int64 Int64; typedef unsigned __int64 UInt64; +#define UINT64_CONST(n) n #else typedef long long int Int64; typedef unsigned long long int UInt64; +#define UINT64_CONST(n) n ## ULL #endif #endif diff --git a/C/XzCrc64.c b/C/XzCrc64.c index 52952ebe..0369554b 100755 --- a/C/XzCrc64.c +++ b/C/XzCrc64.c @@ -1,9 +1,9 @@ /* XzCrc64.c -- CRC64 calculation -2009-04-15 : Igor Pavlov : Public domain */ +2010-04-16 : Igor Pavlov : Public domain */ #include "XzCrc64.h" -#define kCrc64Poly 0xC96C5795D7870F42 +#define kCrc64Poly UINT64_CONST(0xC96C5795D7870F42) UInt64 g_Crc64Table[256]; void MY_FAST_CALL Crc64GenerateTable(void) diff --git a/C/XzCrc64.h b/C/XzCrc64.h index 37a67dc2..0e8efd7e 100755 --- a/C/XzCrc64.h +++ b/C/XzCrc64.h @@ -1,5 +1,5 @@ -/* XzCrc64.c -- CRC64 calculation -2009-04-15 : Igor Pavlov : Public domain */ +/* XzCrc64.h -- CRC64 calculation +2010-04-16 : Igor Pavlov : Public domain */ #ifndef __XZ_CRC64_H #define __XZ_CRC64_H @@ -8,23 +8,19 @@ #include "Types.h" -#ifdef __cplusplus -extern "C" { -#endif +EXTERN_C_BEGIN extern UInt64 g_Crc64Table[]; void MY_FAST_CALL Crc64GenerateTable(void); -#define CRC64_INIT_VAL 0xFFFFFFFFFFFFFFFF -#define CRC64_GET_DIGEST(crc) ((crc) ^ 0xFFFFFFFFFFFFFFFF) +#define CRC64_INIT_VAL UINT64_CONST(0xFFFFFFFFFFFFFFFF) +#define CRC64_GET_DIGEST(crc) ((crc) ^ CRC64_INIT_VAL) #define CRC64_UPDATE_BYTE(crc, b) (g_Crc64Table[((crc) ^ (b)) & 0xFF] ^ ((crc) >> 8)) UInt64 MY_FAST_CALL Crc64Update(UInt64 crc, const void *data, size_t size); UInt64 MY_FAST_CALL Crc64Calc(const void *data, size_t size); -#ifdef __cplusplus -} -#endif +EXTERN_C_END #endif @@ -1,5 +1,5 @@ /* XzDec.c -- Xz Decode -2009-06-08 : Igor Pavlov : Public domain */ +2010-04-16 : Igor Pavlov : Public domain */ /* #define XZ_DUMP */ @@ -858,6 +858,8 @@ SRes XzUnpacker_Code(CXzUnpacker *p, Byte *dest, SizeT *destLen, } break; } + + case XZ_STATE_BLOCK: break; /* to disable GCC warning */ } } /* |