Correct issue 36 on LZ4_uncompress_unknownOutputSize(). Thanks to Clayton Stangeland and Maciej Adamczyk for notifying.

Converted tabs to space

git-svn-id: https://lz4.googlecode.com/svn/trunk@78 650e7d94-2a16-8b24-b05c-7c0b3f6821cd

1 files changed, 430 insertions, 430 deletions

diff --git a/lz4.c b/lz4.c
index eeefa67..13fb5ac 100644
--- a/lz4.c
+++ b/lz4.c
@@ -233,7 +233,7 @@ typedef struct _U64_S { U64 v; } U64_S;
 //**************************************

 struct refTables

 {

-	HTYPE hashTable[HASHTABLESIZE];

+    HTYPE hashTable[HASHTABLESIZE];

 };

 

 

@@ -261,11 +261,11 @@ static inline int LZ4_NbCommonBytes (register U64 val)
     #elif defined(__GNUC__) && (GCC_VERSION >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT)

     return (__builtin_clzll(val) >> 3);

     #else

-	int r;

-	if (!(val>>32)) { r=4; } else { r=0; val>>=32; }

-	if (!(val>>16)) { r+=2; val>>=8; } else { val>>=24; }

-	r += (!val);

-	return r;

+    int r;

+    if (!(val>>32)) { r=4; } else { r=0; val>>=32; }

+    if (!(val>>16)) { r+=2; val>>=8; } else { val>>=24; }

+    r += (!val);

+    return r;

     #endif

 #else

     #if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT)

@@ -275,8 +275,8 @@ static inline int LZ4_NbCommonBytes (register U64 val)
     #elif defined(__GNUC__) && (GCC_VERSION >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT)

     return (__builtin_ctzll(val) >> 3);

     #else

-	static const int DeBruijnBytePos[64] = { 0, 0, 0, 0, 0, 1, 1, 2, 0, 3, 1, 3, 1, 4, 2, 7, 0, 2, 3, 6, 1, 5, 3, 5, 1, 3, 4, 4, 2, 5, 6, 7, 7, 0, 1, 2, 3, 3, 4, 6, 2, 6, 5, 5, 3, 4, 5, 6, 7, 1, 2, 4, 6, 4, 4, 5, 7, 2, 6, 5, 7, 6, 7, 7 };

-	return DeBruijnBytePos[((U64)((val & -val) * 0x0218A392CDABBD3F)) >> 58];

+    static const int DeBruijnBytePos[64] = { 0, 0, 0, 0, 0, 1, 1, 2, 0, 3, 1, 3, 1, 4, 2, 7, 0, 2, 3, 6, 1, 5, 3, 5, 1, 3, 4, 4, 2, 5, 6, 7, 7, 0, 1, 2, 3, 3, 4, 6, 2, 6, 5, 5, 3, 4, 5, 6, 7, 1, 2, 4, 6, 4, 4, 5, 7, 2, 6, 5, 7, 6, 7, 7 };

+    return DeBruijnBytePos[((U64)((val & -val) * 0x0218A392CDABBD3F)) >> 58];

     #endif

 #endif

 }

@@ -293,10 +293,10 @@ static inline int LZ4_NbCommonBytes (register U32 val)
     #elif defined(__GNUC__) && (GCC_VERSION >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT)

     return (__builtin_clz(val) >> 3);

     #else

-	int r;

-	if (!(val>>16)) { r=2; val>>=8; } else { r=0; val>>=24; }

-	r += (!val);

-	return r;

+    int r;

+    if (!(val>>16)) { r=2; val>>=8; } else { r=0; val>>=24; }

+    r += (!val);

+    return r;

     #endif

 #else

     #if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT)

@@ -306,8 +306,8 @@ static inline int LZ4_NbCommonBytes (register U32 val)
     #elif defined(__GNUC__) && (GCC_VERSION >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT)

     return (__builtin_ctz(val) >> 3);

     #else

-	static const int DeBruijnBytePos[32] = { 0, 0, 3, 0, 3, 1, 3, 0, 3, 2, 2, 1, 3, 2, 0, 1, 3, 3, 1, 2, 2, 2, 2, 0, 3, 1, 2, 0, 1, 0, 1, 1 };

-	return DeBruijnBytePos[((U32)((val & -(S32)val) * 0x077CB531U)) >> 27];

+    static const int DeBruijnBytePos[32] = { 0, 0, 3, 0, 3, 1, 3, 0, 3, 2, 2, 1, 3, 2, 0, 1, 3, 3, 1, 2, 2, 2, 2, 0, 3, 1, 2, 0, 1, 0, 1, 1 };

+    return DeBruijnBytePos[((U32)((val & -(S32)val) * 0x077CB531U)) >> 27];

     #endif

 #endif

 }

@@ -327,161 +327,161 @@ static inline int LZ4_NbCommonBytes (register U32 val)
 // return : the number of bytes written in buffer 'dest', or 0 if the compression fails

 

 static inline int LZ4_compressCtx(void** ctx,

-				 const char* source,

-				 char* dest,

-				 int isize,

-				 int maxOutputSize)

+                 const char* source,

+                 char* dest,

+                 int isize,

+                 int maxOutputSize)

 {

 #if HEAPMODE

-	struct refTables *srt = (struct refTables *) (*ctx);

-	HTYPE* HashTable;

+    struct refTables *srt = (struct refTables *) (*ctx);

+    HTYPE* HashTable;

 #else

-	HTYPE HashTable[HASHTABLESIZE] = {0};

+    HTYPE HashTable[HASHTABLESIZE] = {0};

 #endif

 

-	const BYTE* ip = (BYTE*) source;

-	INITBASE(base);

-	const BYTE* anchor = ip;

-	const BYTE* const iend = ip + isize;

-	const BYTE* const mflimit = iend - MFLIMIT;

+    const BYTE* ip = (BYTE*) source;

+    INITBASE(base);

+    const BYTE* anchor = ip;

+    const BYTE* const iend = ip + isize;

+    const BYTE* const mflimit = iend - MFLIMIT;

 #define matchlimit (iend - LASTLITERALS)

 

-	BYTE* op = (BYTE*) dest;

-	BYTE* const oend = op + maxOutputSize;

+    BYTE* op = (BYTE*) dest;

+    BYTE* const oend = op + maxOutputSize;

 

-	int len, length;

-	const int skipStrength = SKIPSTRENGTH;

-	U32 forwardH;

+    int len, length;

+    const int skipStrength = SKIPSTRENGTH;

+    U32 forwardH;

 

 

-	// Init

-	if (isize<MINLENGTH) goto _last_literals;

+    // Init

+    if (isize<MINLENGTH) goto _last_literals;

 #if HEAPMODE

-	if (*ctx == NULL)

-	{

-		srt = (struct refTables *) malloc ( sizeof(struct refTables) );

-		*ctx = (void*) srt;

-	}

-	HashTable = (HTYPE*)(srt->hashTable);

-	memset((void*)HashTable, 0, sizeof(srt->hashTable));

+    if (*ctx == NULL)

+    {

+        srt = (struct refTables *) malloc ( sizeof(struct refTables) );

+        *ctx = (void*) srt;

+    }

+    HashTable = (HTYPE*)(srt->hashTable);

+    memset((void*)HashTable, 0, sizeof(srt->hashTable));

 #else

-	(void) ctx;

+    (void) ctx;

 #endif

 

 

-	// First Byte

-	HashTable[LZ4_HASH_VALUE(ip)] = ip - base;

-	ip++; forwardH = LZ4_HASH_VALUE(ip);

+    // First Byte

+    HashTable[LZ4_HASH_VALUE(ip)] = ip - base;

+    ip++; forwardH = LZ4_HASH_VALUE(ip);

 

-	// Main Loop

+    // Main Loop

     for ( ; ; )

-	{

-		int findMatchAttempts = (1U << skipStrength) + 3;

-		const BYTE* forwardIp = ip;

-		const BYTE* ref;

-		BYTE* token;

-

-		// Find a match

-		do {

-			U32 h = forwardH;

-			int step = findMatchAttempts++ >> skipStrength;

-			ip = forwardIp;

-			forwardIp = ip + step;

-

-			if unlikely(forwardIp > mflimit) { goto _last_literals; }

-

-			forwardH = LZ4_HASH_VALUE(forwardIp);

-			ref = base + HashTable[h];

-			HashTable[h] = ip - base;

-

-		} while ((ref < ip - MAX_DISTANCE) || (A32(ref) != A32(ip)));

-

-		// Catch up

-		while ((ip>anchor) && (ref>(BYTE*)source) && unlikely(ip[-1]==ref[-1])) { ip--; ref--; }

-

-		// Encode Literal length

-		length = (int)(ip - anchor);

-		token = op++;

-		if unlikely(op + length + (2 + 1 + LASTLITERALS) + (length>>8) >= oend) return 0; 		// Check output limit

+    {

+        int findMatchAttempts = (1U << skipStrength) + 3;

+        const BYTE* forwardIp = ip;

+        const BYTE* ref;

+        BYTE* token;

+

+        // Find a match

+        do {

+            U32 h = forwardH;

+            int step = findMatchAttempts++ >> skipStrength;

+            ip = forwardIp;

+            forwardIp = ip + step;

+

+            if unlikely(forwardIp > mflimit) { goto _last_literals; }

+

+            forwardH = LZ4_HASH_VALUE(forwardIp);

+            ref = base + HashTable[h];

+            HashTable[h] = ip - base;

+

+        } while ((ref < ip - MAX_DISTANCE) || (A32(ref) != A32(ip)));

+

+        // Catch up

+        while ((ip>anchor) && (ref>(BYTE*)source) && unlikely(ip[-1]==ref[-1])) { ip--; ref--; }

+

+        // Encode Literal length

+        length = (int)(ip - anchor);

+        token = op++;

+        if unlikely(op + length + (2 + 1 + LASTLITERALS) + (length>>8) >= oend) return 0; 		// Check output limit

 #ifdef _MSC_VER

-		if (length>=(int)RUN_MASK) 

-		{ 

-			int len = length-RUN_MASK; 

-			*token=(RUN_MASK<<ML_BITS); 

-			if (len>254)

-			{

-				do { *op++ = 255; len -= 255; } while (len>254);

-				*op++ = (BYTE)len; 

-				memcpy(op, anchor, length);

-				op += length;

-				goto _next_match;

-			}

-			else

-			*op++ = (BYTE)len; 

-		}

-		else *token = (length<<ML_BITS);

+        if (length>=(int)RUN_MASK) 

+        { 

+            int len = length-RUN_MASK; 

+            *token=(RUN_MASK<<ML_BITS); 

+            if (len>254)

+            {

+                do { *op++ = 255; len -= 255; } while (len>254);

+                *op++ = (BYTE)len; 

+                memcpy(op, anchor, length);

+                op += length;

+                goto _next_match;

+            }

+            else

+            *op++ = (BYTE)len; 

+        }

+        else *token = (length<<ML_BITS);

 #else

-		if (length>=(int)RUN_MASK) { *token=(RUN_MASK<<ML_BITS); len = length-RUN_MASK; for(; len > 254 ; len-=255) *op++ = 255; *op++ = (BYTE)len; }

-		else *token = (length<<ML_BITS);

+        if (length>=(int)RUN_MASK) { *token=(RUN_MASK<<ML_BITS); len = length-RUN_MASK; for(; len > 254 ; len-=255) *op++ = 255; *op++ = (BYTE)len; }

+        else *token = (length<<ML_BITS);

 #endif

 

-		// Copy Literals

-		LZ4_BLINDCOPY(anchor, op, length);

+        // Copy Literals

+        LZ4_BLINDCOPY(anchor, op, length);

 

 _next_match:

-		// Encode Offset

-		LZ4_WRITE_LITTLEENDIAN_16(op,(U16)(ip-ref));

-

-		// Start Counting

-		ip+=MINMATCH; ref+=MINMATCH;   // MinMatch verified

-		anchor = ip;

-		while likely(ip<matchlimit-(STEPSIZE-1))

-		{

-			UARCH diff = AARCH(ref) ^ AARCH(ip);

-			if (!diff) { ip+=STEPSIZE; ref+=STEPSIZE; continue; }

-			ip += LZ4_NbCommonBytes(diff);

-			goto _endCount;

-		}

-		if (LZ4_ARCH64) if ((ip<(matchlimit-3)) && (A32(ref) == A32(ip))) { ip+=4; ref+=4; }

-		if ((ip<(matchlimit-1)) && (A16(ref) == A16(ip))) { ip+=2; ref+=2; }

-		if ((ip<matchlimit) && (*ref == *ip)) ip++;

+        // Encode Offset

+        LZ4_WRITE_LITTLEENDIAN_16(op,(U16)(ip-ref));

+

+        // Start Counting

+        ip+=MINMATCH; ref+=MINMATCH;   // MinMatch verified

+        anchor = ip;

+        while likely(ip<matchlimit-(STEPSIZE-1))

+        {

+            UARCH diff = AARCH(ref) ^ AARCH(ip);

+            if (!diff) { ip+=STEPSIZE; ref+=STEPSIZE; continue; }

+            ip += LZ4_NbCommonBytes(diff);

+            goto _endCount;

+        }

+        if (LZ4_ARCH64) if ((ip<(matchlimit-3)) && (A32(ref) == A32(ip))) { ip+=4; ref+=4; }

+        if ((ip<(matchlimit-1)) && (A16(ref) == A16(ip))) { ip+=2; ref+=2; }

+        if ((ip<matchlimit) && (*ref == *ip)) ip++;

 _endCount:

 

-		// Encode MatchLength

-		len = (int)(ip - anchor);

-		if unlikely(op + (1 + LASTLITERALS) + (len>>8) >= oend) return 0; 		// Check output limit

-		if (len>=(int)ML_MASK) { *token+=ML_MASK; len-=ML_MASK; for(; len > 509 ; len-=510) { *op++ = 255; *op++ = 255; } if (len > 254) { len-=255; *op++ = 255; } *op++ = (BYTE)len; }

-		else *token += len;

+        // Encode MatchLength

+        len = (int)(ip - anchor);

+        if unlikely(op + (1 + LASTLITERALS) + (len>>8) >= oend) return 0; 		// Check output limit

+        if (len>=(int)ML_MASK) { *token+=ML_MASK; len-=ML_MASK; for(; len > 509 ; len-=510) { *op++ = 255; *op++ = 255; } if (len > 254) { len-=255; *op++ = 255; } *op++ = (BYTE)len; }

+        else *token += len;

 

-		// Test end of chunk

-		if (ip > mflimit) { anchor = ip;  break; }

+        // Test end of chunk

+        if (ip > mflimit) { anchor = ip;  break; }

 

-		// Fill table

-		HashTable[LZ4_HASH_VALUE(ip-2)] = ip - 2 - base;

+        // Fill table

+        HashTable[LZ4_HASH_VALUE(ip-2)] = ip - 2 - base;

 

-		// Test next position

-		ref = base + HashTable[LZ4_HASH_VALUE(ip)];

-		HashTable[LZ4_HASH_VALUE(ip)] = ip - base;

-		if ((ref > ip - (MAX_DISTANCE + 1)) && (A32(ref) == A32(ip))) { token = op++; *token=0; goto _next_match; }

+        // Test next position

+        ref = base + HashTable[LZ4_HASH_VALUE(ip)];

+        HashTable[LZ4_HASH_VALUE(ip)] = ip - base;

+        if ((ref > ip - (MAX_DISTANCE + 1)) && (A32(ref) == A32(ip))) { token = op++; *token=0; goto _next_match; }

 

-		// Prepare next loop

-		anchor = ip++;

-		forwardH = LZ4_HASH_VALUE(ip);

-	}

+        // Prepare next loop

+        anchor = ip++;

+        forwardH = LZ4_HASH_VALUE(ip);

+    }

 

 _last_literals:

-	// Encode Last Literals

-	{

-		int lastRun = (int)(iend - anchor);

-		if (((char*)op - dest) + lastRun + 1 + ((lastRun-15)/255) >= maxOutputSize) return 0;

-		if (lastRun>=(int)RUN_MASK) { *op++=(RUN_MASK<<ML_BITS); lastRun-=RUN_MASK; for(; lastRun > 254 ; lastRun-=255) *op++ = 255; *op++ = (BYTE) lastRun; }

-		else *op++ = (lastRun<<ML_BITS);

-		memcpy(op, anchor, iend - anchor);

-		op += iend-anchor;

-	}

-

-	// End

-	return (int) (((char*)op)-dest);

+    // Encode Last Literals

+    {

+        int lastRun = (int)(iend - anchor);

+        if (((char*)op - dest) + lastRun + 1 + ((lastRun-15)/255) >= maxOutputSize) return 0;

+        if (lastRun>=(int)RUN_MASK) { *op++=(RUN_MASK<<ML_BITS); lastRun-=RUN_MASK; for(; lastRun > 254 ; lastRun-=255) *op++ = 255; *op++ = (BYTE) lastRun; }

+        else *op++ = (lastRun<<ML_BITS);

+        memcpy(op, anchor, iend - anchor);

+        op += iend-anchor;

+    }

+

+    // End

+    return (int) (((char*)op)-dest);

 }

 

 

@@ -493,188 +493,188 @@ _last_literals:
 #define LZ4_HASH64K_FUNCTION(i)	(((i) * 2654435761U) >> ((MINMATCH*8)-HASHLOG64K))

 #define LZ4_HASH64K_VALUE(p)	LZ4_HASH64K_FUNCTION(A32(p))

 static inline int LZ4_compress64kCtx(void** ctx,

-				 const char* source,

-				 char* dest,

-				 int isize,

-				 int maxOutputSize)

+                 const char* source,

+                 char* dest,

+                 int isize,

+                 int maxOutputSize)

 {

 #if HEAPMODE

-	struct refTables *srt = (struct refTables *) (*ctx);

-	U16* HashTable;

+    struct refTables *srt = (struct refTables *) (*ctx);

+    U16* HashTable;

 #else

-	U16 HashTable[HASH64KTABLESIZE] = {0};

+    U16 HashTable[HASH64KTABLESIZE] = {0};

 #endif

 

-	const BYTE* ip = (BYTE*) source;

-	const BYTE* anchor = ip;

-	const BYTE* const base = ip;

-	const BYTE* const iend = ip + isize;

-	const BYTE* const mflimit = iend - MFLIMIT;

+    const BYTE* ip = (BYTE*) source;

+    const BYTE* anchor = ip;

+    const BYTE* const base = ip;

+    const BYTE* const iend = ip + isize;

+    const BYTE* const mflimit = iend - MFLIMIT;

 #define matchlimit (iend - LASTLITERALS)

 

-	BYTE* op = (BYTE*) dest;

-	BYTE* const oend = op + maxOutputSize;

+    BYTE* op = (BYTE*) dest;

+    BYTE* const oend = op + maxOutputSize;

 

-	int len, length;

-	const int skipStrength = SKIPSTRENGTH;

-	U32 forwardH;

+    int len, length;

+    const int skipStrength = SKIPSTRENGTH;

+    U32 forwardH;

 

 

-	// Init

-	if (isize<MINLENGTH) goto _last_literals;

+    // Init

+    if (isize<MINLENGTH) goto _last_literals;

 #if HEAPMODE

-	if (*ctx == NULL)

-	{

-		srt = (struct refTables *) malloc ( sizeof(struct refTables) );

-		*ctx = (void*) srt;

-	}

-	HashTable = (U16*)(srt->hashTable);

-	memset((void*)HashTable, 0, sizeof(srt->hashTable));

+    if (*ctx == NULL)

+    {

+        srt = (struct refTables *) malloc ( sizeof(struct refTables) );

+        *ctx = (void*) srt;

+    }

+    HashTable = (U16*)(srt->hashTable);

+    memset((void*)HashTable, 0, sizeof(srt->hashTable));

 #else

-	(void) ctx;

+    (void) ctx;

 #endif

 

 

-	// First Byte

-	ip++; forwardH = LZ4_HASH64K_VALUE(ip);

+    // First Byte

+    ip++; forwardH = LZ4_HASH64K_VALUE(ip);

 

-	// Main Loop

+    // Main Loop

     for ( ; ; )

-	{

-		int findMatchAttempts = (1U << skipStrength) + 3;

-		const BYTE* forwardIp = ip;

-		const BYTE* ref;

-		BYTE* token;

-

-		// Find a match

-		do {

-			U32 h = forwardH;

-			int step = findMatchAttempts++ >> skipStrength;

-			ip = forwardIp;

-			forwardIp = ip + step;

-

-			if (forwardIp > mflimit) { goto _last_literals; }

-

-			forwardH = LZ4_HASH64K_VALUE(forwardIp);

-			ref = base + HashTable[h];

-			HashTable[h] = (U16)(ip - base);

-

-		} while (A32(ref) != A32(ip));

-

-		// Catch up

-		while ((ip>anchor) && (ref>(BYTE*)source) && (ip[-1]==ref[-1])) { ip--; ref--; }

-

-		// Encode Literal length

-		length = (int)(ip - anchor);

-		token = op++;

-		if unlikely(op + length + (2 + 1 + LASTLITERALS) + (length>>8) >= oend) return 0; 		// Check output limit

+    {

+        int findMatchAttempts = (1U << skipStrength) + 3;

+        const BYTE* forwardIp = ip;

+        const BYTE* ref;

+        BYTE* token;

+

+        // Find a match

+        do {

+            U32 h = forwardH;

+            int step = findMatchAttempts++ >> skipStrength;

+            ip = forwardIp;

+            forwardIp = ip + step;

+

+            if (forwardIp > mflimit) { goto _last_literals; }

+

+            forwardH = LZ4_HASH64K_VALUE(forwardIp);

+            ref = base + HashTable[h];

+            HashTable[h] = (U16)(ip - base);

+

+        } while (A32(ref) != A32(ip));

+

+        // Catch up

+        while ((ip>anchor) && (ref>(BYTE*)source) && (ip[-1]==ref[-1])) { ip--; ref--; }

+

+        // Encode Literal length

+        length = (int)(ip - anchor);

+        token = op++;

+        if unlikely(op + length + (2 + 1 + LASTLITERALS) + (length>>8) >= oend) return 0; 		// Check output limit

 #ifdef _MSC_VER

-		if (length>=(int)RUN_MASK) 

-		{ 

-			int len = length-RUN_MASK; 

-			*token=(RUN_MASK<<ML_BITS); 

-			if (len>254)

-			{

-				do { *op++ = 255; len -= 255; } while (len>254);

-				*op++ = (BYTE)len; 

-				memcpy(op, anchor, length);

-				op += length;

-				goto _next_match;

-			}

-			else

-			*op++ = (BYTE)len; 

-		}

-		else *token = (length<<ML_BITS);

+        if (length>=(int)RUN_MASK) 

+        { 

+            int len = length-RUN_MASK; 

+            *token=(RUN_MASK<<ML_BITS); 

+            if (len>254)

+            {

+                do { *op++ = 255; len -= 255; } while (len>254);

+                *op++ = (BYTE)len; 

+                memcpy(op, anchor, length);

+                op += length;

+                goto _next_match;

+            }

+            else

+            *op++ = (BYTE)len; 

+        }

+        else *token = (length<<ML_BITS);

 #else

-		if (length>=(int)RUN_MASK) { *token=(RUN_MASK<<ML_BITS); len = length-RUN_MASK; for(; len > 254 ; len-=255) *op++ = 255; *op++ = (BYTE)len; }

-		else *token = (length<<ML_BITS);

+        if (length>=(int)RUN_MASK) { *token=(RUN_MASK<<ML_BITS); len = length-RUN_MASK; for(; len > 254 ; len-=255) *op++ = 255; *op++ = (BYTE)len; }

+        else *token = (length<<ML_BITS);

 #endif

 

-		// Copy Literals

-		LZ4_BLINDCOPY(anchor, op, length);

+        // Copy Literals

+        LZ4_BLINDCOPY(anchor, op, length);

 

 _next_match:

-		// Encode Offset

-		LZ4_WRITE_LITTLEENDIAN_16(op,(U16)(ip-ref));

-

-		// Start Counting

-		ip+=MINMATCH; ref+=MINMATCH;   // MinMatch verified

-		anchor = ip;

-		while (ip<matchlimit-(STEPSIZE-1))

-		{

-			UARCH diff = AARCH(ref) ^ AARCH(ip);

-			if (!diff) { ip+=STEPSIZE; ref+=STEPSIZE; continue; }

-			ip += LZ4_NbCommonBytes(diff);

-			goto _endCount;

-		}

-		if (LZ4_ARCH64) if ((ip<(matchlimit-3)) && (A32(ref) == A32(ip))) { ip+=4; ref+=4; }

-		if ((ip<(matchlimit-1)) && (A16(ref) == A16(ip))) { ip+=2; ref+=2; }

-		if ((ip<matchlimit) && (*ref == *ip)) ip++;

+        // Encode Offset

+        LZ4_WRITE_LITTLEENDIAN_16(op,(U16)(ip-ref));

+

+        // Start Counting

+        ip+=MINMATCH; ref+=MINMATCH;   // MinMatch verified

+        anchor = ip;

+        while (ip<matchlimit-(STEPSIZE-1))

+        {

+            UARCH diff = AARCH(ref) ^ AARCH(ip);

+            if (!diff) { ip+=STEPSIZE; ref+=STEPSIZE; continue; }

+            ip += LZ4_NbCommonBytes(diff);

+            goto _endCount;

+        }

+        if (LZ4_ARCH64) if ((ip<(matchlimit-3)) && (A32(ref) == A32(ip))) { ip+=4; ref+=4; }

+        if ((ip<(matchlimit-1)) && (A16(ref) == A16(ip))) { ip+=2; ref+=2; }

+        if ((ip<matchlimit) && (*ref == *ip)) ip++;

 _endCount:

 

-		// Encode MatchLength

-		len = (int)(ip - anchor);

-		if unlikely(op + (1 + LASTLITERALS) + (len>>8) >= oend) return 0; 		// Check output limit

-		if (len>=(int)ML_MASK) { *token+=ML_MASK; len-=ML_MASK; for(; len > 509 ; len-=510) { *op++ = 255; *op++ = 255; } if (len > 254) { len-=255; *op++ = 255; } *op++ = (BYTE)len; }

-		else *token += len;

+        // Encode MatchLength

+        len = (int)(ip - anchor);

+        if unlikely(op + (1 + LASTLITERALS) + (len>>8) >= oend) return 0; 		// Check output limit

+        if (len>=(int)ML_MASK) { *token+=ML_MASK; len-=ML_MASK; for(; len > 509 ; len-=510) { *op++ = 255; *op++ = 255; } if (len > 254) { len-=255; *op++ = 255; } *op++ = (BYTE)len; }

+        else *token += len;

 

-		// Test end of chunk

-		if (ip > mflimit) { anchor = ip;  break; }

+        // Test end of chunk

+        if (ip > mflimit) { anchor = ip;  break; }

 

-		// Fill table

-		HashTable[LZ4_HASH64K_VALUE(ip-2)] = (U16)(ip - 2 - base);

+        // Fill table

+        HashTable[LZ4_HASH64K_VALUE(ip-2)] = (U16)(ip - 2 - base);

 

-		// Test next position

-		ref = base + HashTable[LZ4_HASH64K_VALUE(ip)];

-		HashTable[LZ4_HASH64K_VALUE(ip)] = (U16)(ip - base);

-		if (A32(ref) == A32(ip)) { token = op++; *token=0; goto _next_match; }

+        // Test next position

+        ref = base + HashTable[LZ4_HASH64K_VALUE(ip)];

+        HashTable[LZ4_HASH64K_VALUE(ip)] = (U16)(ip - base);

+        if (A32(ref) == A32(ip)) { token = op++; *token=0; goto _next_match; }

 

-		// Prepare next loop

-		anchor = ip++;

-		forwardH = LZ4_HASH64K_VALUE(ip);

-	}

+        // Prepare next loop

+        anchor = ip++;

+        forwardH = LZ4_HASH64K_VALUE(ip);

+    }

 

 _last_literals:

-	// Encode Last Literals

-	{

-		int lastRun = (int)(iend - anchor);

-		if (((char*)op - dest) + lastRun + 1 + ((lastRun)>>8) >= maxOutputSize) return 0;

-		if (lastRun>=(int)RUN_MASK) { *op++=(RUN_MASK<<ML_BITS); lastRun-=RUN_MASK; for(; lastRun > 254 ; lastRun-=255) *op++ = 255; *op++ = (BYTE) lastRun; }

-		else *op++ = (lastRun<<ML_BITS);

-		memcpy(op, anchor, iend - anchor);

-		op += iend-anchor;

-	}

-

-	// End

-	return (int) (((char*)op)-dest);

+    // Encode Last Literals

+    {

+        int lastRun = (int)(iend - anchor);

+        if (((char*)op - dest) + lastRun + 1 + ((lastRun)>>8) >= maxOutputSize) return 0;

+        if (lastRun>=(int)RUN_MASK) { *op++=(RUN_MASK<<ML_BITS); lastRun-=RUN_MASK; for(; lastRun > 254 ; lastRun-=255) *op++ = 255; *op++ = (BYTE) lastRun; }

+        else *op++ = (lastRun<<ML_BITS);

+        memcpy(op, anchor, iend - anchor);

+        op += iend-anchor;

+    }

+

+    // End

+    return (int) (((char*)op)-dest);

 }

 

 

 int LZ4_compress_limitedOutput(const char* source, 

-							   char* dest, 

-							   int isize, 

-							   int maxOutputSize)

+                               char* dest, 

+                               int isize, 

+                               int maxOutputSize)

 {

 #if HEAPMODE

-	void* ctx = malloc(sizeof(struct refTables));

-	int result;

-	if (isize < LZ4_64KLIMIT)

-		result = LZ4_compress64kCtx(&ctx, source, dest, isize, maxOutputSize);

-	else result = LZ4_compressCtx(&ctx, source, dest, isize, maxOutputSize);

-	free(ctx);

-	return result;

+    void* ctx = malloc(sizeof(struct refTables));

+    int result;

+    if (isize < LZ4_64KLIMIT)

+        result = LZ4_compress64kCtx(&ctx, source, dest, isize, maxOutputSize);

+    else result = LZ4_compressCtx(&ctx, source, dest, isize, maxOutputSize);

+    free(ctx);

+    return result;

 #else

-	if (isize < (int)LZ4_64KLIMIT) return LZ4_compress64kCtx(NULL, source, dest, isize, maxOutputSize);

-	return LZ4_compressCtx(NULL, source, dest, isize, maxOutputSize);

+    if (isize < (int)LZ4_64KLIMIT) return LZ4_compress64kCtx(NULL, source, dest, isize, maxOutputSize);

+    return LZ4_compressCtx(NULL, source, dest, isize, maxOutputSize);

 #endif

 }

 

 

 int LZ4_compress(const char* source,

-				 char* dest,

-				 int isize)

+                 char* dest,

+                 int isize)

 {

-	return LZ4_compress_limitedOutput(source, dest, isize, LZ4_compressBound(isize));

+    return LZ4_compress_limitedOutput(source, dest, isize, LZ4_compressBound(isize));

 }

 

 

@@ -691,173 +691,173 @@ int LZ4_compress(const char* source,
 //		A corrupted input will produce an error result, a negative int, indicating the position of the error within input stream.

 

 int LZ4_uncompress(const char* source,

-				 char* dest,

-				 int osize)

+                 char* dest,

+                 int osize)

 {

-	// Local Variables

-	const BYTE* restrict ip = (const BYTE*) source;

-	const BYTE* restrict ref;

-

-	BYTE* restrict op = (BYTE*) dest;

-	BYTE* const oend = op + osize;

-	BYTE* cpy;

-

-	BYTE token;

-

-	int	len, length;

-	size_t dec[] ={0, 3, 2, 3, 0, 0, 0, 0};

-

-

-	// Main Loop

-	while (1)

-	{

-		// get runlength

-		token = *ip++;

-		if ((length=(token>>ML_BITS)) == RUN_MASK)  { for (;(len=*ip++)==255;length+=255){} length += len; }

-

-		// copy literals

-		cpy = op+length;

-		if unlikely(cpy>oend-COPYLENGTH)

-		{

-			if (cpy > oend) goto _output_error;          // Error : request to write beyond destination buffer

-			memcpy(op, ip, length);

-			ip += length;

-			break;    // Necessarily EOF

-		}

-		LZ4_WILDCOPY(ip, op, cpy); ip -= (op-cpy); op = cpy;

-

-		// get offset

-		LZ4_READ_LITTLEENDIAN_16(ref,cpy,ip); ip+=2;

-		if (ref < (BYTE* const)dest) goto _output_error;   // Error : offset create reference outside destination buffer

-

-		// get matchlength

-		if ((length=(token&ML_MASK)) == ML_MASK) { for (;*ip==255;length+=255) {ip++;} length += *ip++; }

-

-		// copy repeated sequence

-		if unlikely(op-ref<STEPSIZE)

-		{

+    // Local Variables

+    const BYTE* restrict ip = (const BYTE*) source;

+    const BYTE* restrict ref;

+

+    BYTE* restrict op = (BYTE*) dest;

+    BYTE* const oend = op + osize;

+    BYTE* cpy;

+

+    BYTE token;

+

+    int	len, length;

+    size_t dec[] ={0, 3, 2, 3, 0, 0, 0, 0};

+

+

+    // Main Loop

+    while (1)

+    {

+        // get runlength

+        token = *ip++;

+        if ((length=(token>>ML_BITS)) == RUN_MASK)  { for (;(len=*ip++)==255;length+=255){} length += len; }

+

+        // copy literals

+        cpy = op+length;

+        if unlikely(cpy>oend-COPYLENGTH)

+        {

+            if (cpy > oend) goto _output_error;          // Error : request to write beyond destination buffer

+            memcpy(op, ip, length);

+            ip += length;

+            break;    // Necessarily EOF

+        }

+        LZ4_WILDCOPY(ip, op, cpy); ip -= (op-cpy); op = cpy;

+

+        // get offset

+        LZ4_READ_LITTLEENDIAN_16(ref,cpy,ip); ip+=2;

+        if (ref < (BYTE* const)dest) goto _output_error;   // Error : offset create reference outside destination buffer

+

+        // get matchlength

+        if ((length=(token&ML_MASK)) == ML_MASK) { for (;*ip==255;length+=255) {ip++;} length += *ip++; }

+

+        // copy repeated sequence

+        if unlikely(op-ref<STEPSIZE)

+        {

 #if LZ4_ARCH64

-			size_t dec2table[]={0, 0, 0, -1, 0, 1, 2, 3};

-			size_t dec2 = dec2table[op-ref];

+            size_t dec2table[]={0, 0, 0, -1, 0, 1, 2, 3};

+            size_t dec2 = dec2table[op-ref];

 #else

-			const int dec2 = 0;

+            const int dec2 = 0;

 #endif

-			*op++ = *ref++;

-			*op++ = *ref++;

-			*op++ = *ref++;

-			*op++ = *ref++;

-			ref -= dec[op-ref];

-			A32(op)=A32(ref); op += STEPSIZE-4;

-			ref -= dec2;

-		} else { LZ4_COPYSTEP(ref,op); }

-		cpy = op + length - (STEPSIZE-4);

-		if (cpy>oend-COPYLENGTH)

-		{

-			if (cpy > oend) goto _output_error;             // Error : request to write beyond destination buffer

-			LZ4_SECURECOPY(ref, op, (oend-COPYLENGTH));

-			while(op<cpy) *op++=*ref++;

-			op=cpy;

-			if (op == oend) break;    // Check EOF (should never happen, since last 5 bytes are supposed to be literals)

-			continue;

-		}

-		LZ4_SECURECOPY(ref, op, cpy);

-		op=cpy;		// correction

-	}

-

-	// end of decoding

-	return (int) (((char*)ip)-source);

-

-	// write overflow error detected

+            *op++ = *ref++;

+            *op++ = *ref++;

+            *op++ = *ref++;

+            *op++ = *ref++;

+            ref -= dec[op-ref];

+            A32(op)=A32(ref); op += STEPSIZE-4;

+            ref -= dec2;

+        } else { LZ4_COPYSTEP(ref,op); }

+        cpy = op + length - (STEPSIZE-4);

+        if (cpy>oend-COPYLENGTH)

+        {

+            if (cpy > oend) goto _output_error;             // Error : request to write beyond destination buffer

+            LZ4_SECURECOPY(ref, op, (oend-COPYLENGTH));

+            while(op<cpy) *op++=*ref++;

+            op=cpy;

+            if (op == oend) break;    // Check EOF (should never happen, since last 5 bytes are supposed to be literals)

+            continue;

+        }

+        LZ4_SECURECOPY(ref, op, cpy);

+        op=cpy;		// correction

+    }

+

+    // end of decoding

+    return (int) (((char*)ip)-source);

+

+    // write overflow error detected

 _output_error:

-	return (int) (-(((char*)ip)-source));

+    return (int) (-(((char*)ip)-source));

 }

 

 

 int LZ4_uncompress_unknownOutputSize(

-				const char* source,

-				char* dest,

-				int isize,

-				int maxOutputSize)

+                const char* source,

+                char* dest,

+                int isize,

+                int maxOutputSize)

 {

-	// Local Variables

-	const BYTE* restrict ip = (const BYTE*) source;

-	const BYTE* const iend = ip + isize;

-	const BYTE* restrict ref;

-

-	BYTE* restrict op = (BYTE*) dest;

-	BYTE* const oend = op + maxOutputSize;

-	BYTE* cpy;

-

-	size_t dec[] ={0, 3, 2, 3, 0, 0, 0, 0};

-

-

-	// Main Loop

-	while (ip<iend)

-	{

-		BYTE token;

-		int length;

-

-		// get runlength

-		token = *ip++;

-		if ((length=(token>>ML_BITS)) == RUN_MASK) { int s=255; while ((ip<iend) && (s==255)) { s=*ip++; length += s; } }

-

-		// copy literals

-		cpy = op+length;

-		if ((cpy>oend-COPYLENGTH) || (ip+length>iend-COPYLENGTH))

-		{

-			if (cpy > oend) goto _output_error;          // Error : request to write beyond destination buffer

-			if (ip+length > iend) goto _output_error;    // Error : request to read beyond source buffer

-			memcpy(op, ip, length);

-			op += length;

-			ip += length;

-			if (ip<iend) goto _output_error;             // Error : LZ4 format violation

-			break;    // Necessarily EOF, due to parsing restrictions

-		}

-		LZ4_WILDCOPY(ip, op, cpy); ip -= (op-cpy); op = cpy;

-

-		// get offset

-		LZ4_READ_LITTLEENDIAN_16(ref,cpy,ip); ip+=2;

-		if (ref < (BYTE* const)dest) goto _output_error;   // Error : offset creates reference outside of destination buffer

-

-		// get matchlength

-		if ((length=(token&ML_MASK)) == ML_MASK) { while (ip<iend) { int s = *ip++; length +=s; if (s==255) continue; break; } }

-

-		// copy repeated sequence

-		if unlikely(op-ref<STEPSIZE)

-		{

+    // Local Variables

+    const BYTE* restrict ip = (const BYTE*) source;

+    const BYTE* const iend = ip + isize;

+    const BYTE* restrict ref;

+

+    BYTE* restrict op = (BYTE*) dest;

+    BYTE* const oend = op + maxOutputSize;

+    BYTE* cpy;

+

+    size_t dec[] ={0, 3, 2, 3, 0, 0, 0, 0};

+

+

+    // Main Loop

+    while (ip<iend)

+    {

+        BYTE token;

+        int length;

+

+        // get runlength

+        token = *ip++;

+        if ((length=(token>>ML_BITS)) == RUN_MASK) { int s=255; while ((ip<iend) && (s==255)) { s=*ip++; length += s; } }

+

+        // copy literals

+        cpy = op+length;

+        if ((cpy>oend-COPYLENGTH) || (ip+length>iend-COPYLENGTH))

+        {

+            if (cpy > oend) goto _output_error;          // Error : request to write beyond destination buffer

+            if (ip+length > iend) goto _output_error;    // Error : request to read beyond source buffer

+            memcpy(op, ip, length);

+            op += length;

+            ip += length;

+            if (ip<iend) goto _output_error;             // Error : LZ4 format violation

+            break;    // Necessarily EOF, due to parsing restrictions

+        }

+        LZ4_WILDCOPY(ip, op, cpy); ip -= (op-cpy); op = cpy;

+

+        // get offset

+        LZ4_READ_LITTLEENDIAN_16(ref,cpy,ip); ip+=2;

+        if (ref < (BYTE* const)dest) goto _output_error;   // Error : offset creates reference outside of destination buffer

+

+        // get matchlength

+        if ((length=(token&ML_MASK)) == ML_MASK) { while (ip<iend) { int s = *ip++; length +=s; if (s==255) continue; break; } }

+

+        // copy repeated sequence

+        if unlikely(op-ref<STEPSIZE)

+        {

 #if LZ4_ARCH64

-			size_t dec2table[]={0, 0, 0, -1, 0, 1, 2, 3};

-			size_t dec2 = dec2table[op-ref];

+            size_t dec2table[]={0, 0, 0, -1, 0, 1, 2, 3};

+            size_t dec2 = dec2table[op-ref];

 #else

-			const int dec2 = 0;

+            const int dec2 = 0;

 #endif

-			*op++ = *ref++;

-			*op++ = *ref++;

-			*op++ = *ref++;

-			*op++ = *ref++;

-			ref -= dec[op-ref];

-			A32(op)=A32(ref); op += STEPSIZE-4;

-			ref -= dec2;

-		} else { LZ4_COPYSTEP(ref,op); }

-		cpy = op + length - (STEPSIZE-4);

-		if (cpy>oend-COPYLENGTH)

-		{

-			if (cpy > oend) goto _output_error;           // Error : request to write outside of destination buffer

-			LZ4_SECURECOPY(ref, op, (oend-COPYLENGTH));

-			while(op<cpy) *op++=*ref++;

-			op=cpy;

-			if (op == oend) break;    // Check EOF (should never happen, since last 5 bytes are supposed to be literals)

-			continue;

-		}

-		LZ4_SECURECOPY(ref, op, cpy);

-		op=cpy;		// correction

-	}

-

-	// end of decoding

-	return (int) (((char*)op)-dest);

-

-	// write overflow error detected

+            *op++ = *ref++;

+            *op++ = *ref++;

+            *op++ = *ref++;

+            *op++ = *ref++;

+            ref -= dec[op-ref];

+            A32(op)=A32(ref); op += STEPSIZE-4;

+            ref -= dec2;

+        } else { LZ4_COPYSTEP(ref,op); }

+        cpy = op + length - (STEPSIZE-4);

+        if (cpy>oend-COPYLENGTH)

+        {

+            if (cpy > oend) goto _output_error;       // Error : request to write outside of destination buffer

+            LZ4_SECURECOPY(ref, op, (oend-COPYLENGTH));

+            while(op<cpy) *op++=*ref++;

+            op=cpy;

+            if (op == oend) goto _output_error;       // Check EOF (should never happen, since last 5 bytes are supposed to be literals)

+            continue;

+        }

+        LZ4_SECURECOPY(ref, op, cpy);

+        op=cpy;		// correction

+    }

+

+    // end of decoding

+    return (int) (((char*)op)-dest);

+

+    // write overflow error detected

 _output_error:

-	return (int) (-(((char*)ip)-source));

+    return (int) (-(((char*)ip)-source));

 }