fixed Tornado

Author: inikep

tornado/MatchFinder.cpp

@@ -1070,10 +1070,10 @@ struct LazyMatching
 
         // Extend match at p+1 one char backward if it's better than match at p
         if (nextlen>=MINLEN && nextq[-1]==*p &&
-               (nextlen+1 >= prevlen && nextdist < prevdist ||
-                nextlen+1 == prevlen + 1 && !ChangePair(prevdist, nextdist) ||
-                nextlen+1 > prevlen + 1 ||
-                nextlen+1 + 1 >= prevlen && prevlen >= MINLEN && ChangePair(nextdist, prevdist)))
+               ((nextlen+1 >= prevlen && nextdist < prevdist) ||
+                (nextlen+1 == prevlen + 1 && !ChangePair(prevdist, nextdist)) ||
+                (nextlen+1 > prevlen + 1) ||
+                (nextlen+1 + 1 >= prevlen && prevlen >= MINLEN && ChangePair(nextdist, prevdist))))
         {
             debug (printf ("Extending %d:%d -> %d:%d\n",  nextlen, nextq-p, nextlen+1, nextq-1-p));
             prevlen = nextlen+1;
@@ -1082,10 +1082,10 @@ struct LazyMatching
         }
 
         // Truncate current match if match at next position will be better (LZMA's algorithm)
-        if (nextlen >= prevlen && nextdist < prevdist/4 ||
-            nextlen == prevlen + 1 && !ChangePair(prevdist, nextdist) ||
-            nextlen > prevlen + 1 ||
-            nextlen + 1 >= prevlen && prevlen >= MINLEN && ChangePair(nextdist, prevdist))
+        if ((nextlen >= prevlen && nextdist < prevdist/4) ||
+            (nextlen == prevlen + 1 && !ChangePair(prevdist, nextdist)) ||
+            (nextlen > prevlen + 1) ||
+            (nextlen + 1 >= prevlen && prevlen >= MINLEN && ChangePair(nextdist, prevdist)))
         {
              return MINLEN-1;
         } else {

tornado/Tornado.cpp

@@ -94,7 +94,7 @@ const int table_dist=256*1024, table_shift=128;
 #define MAX_HASHED_BYTES 600
 
 
-// Îêðóãëèì ðàçìåð õåøà ñ ó÷¸òîì hash_row_width
+// Îêðóãëèì ðàçìåð õåøà ñ ó÷¸òîì hash_row_width
 uint round_to_nearest_hashsize (LongMemSize hashsize, uint hash_row_width)
 {return mymin (round_to_nearest_power_of(mymin(hashsize,2*gb-1) / hash_row_width, 2) * hash_row_width, 2*gb-1);}
 
@@ -444,7 +444,7 @@ int tor_compress (PackMethod &m, CALLBACK_FUNC *callback, void *auxdata, void *b
     }
 #else
     // -1..-5(-6)
-    if (m.encoding_method==BYTECODER && m.hash_row_width==1 && m.hash3==0 && m.match_finder==NON_CACHING_MF && m.match_parser==GREEDY ||
+    if ((m.encoding_method==BYTECODER && m.hash_row_width==1 && m.hash3==0 && m.match_finder==NON_CACHING_MF && m.match_parser==GREEDY) ||
         m.encoding_method==STORING ) {
         return tor_compress0 <MatchFinder1, LZ77_ByteCoder> (m, callback, auxdata, buf, bytes_to_compress);
     } else if (m.encoding_method==BITCODER && m.hash_row_width==1 && m.hash3==0 && m.match_finder==NON_CACHING_MF && m.match_parser==GREEDY ) {

tornado/tor_test.cpp

@@ -66,9 +66,9 @@ int ReadWriteCallback (const char *what, void *buf, int size, void *r_)
     // Print final compression statistics
     return FREEARC_OK;
 
-  } else {
-    return FREEARC_ERRCODE_NOT_IMPLEMENTED;
   }
+
+  return FREEARC_ERRCODE_NOT_IMPLEMENTED;
 }
 
 
@@ -101,8 +101,7 @@ uint32_t tor_compress(uint8_t method, uint8_t* inbuf, uint32_t inlen, uint8_t* o
 	else
 		m = std_Tornado_method[method];
 
-	if (r.inlen >= 0)
-		m.buffer = mymin (m.buffer, r.inlen+LOOKAHEAD*2);
+	m.buffer = mymin (m.buffer, r.inlen+LOOKAHEAD*2);
 	int result = tor_compress (m, ReadWriteCallback, &r, NULL, -1); 
 	return r.outpos;
 }