Imported Upstream version 2.08upstream/2.08sandbox/kevinthierry/upstream

1 files changed, 8 insertions, 19 deletions

diff --git a/src/lzo2a_d.ch b/src/lzo2a_d.ch
index 5822ac0..1f4acf1 100644
--- a/src/lzo2a_d.ch
+++ b/src/lzo2a_d.ch
@@ -2,19 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -53,9 +41,9 @@ DO_DECOMPRESS    ( const lzo_bytep in , lzo_uint  in_len,
                          lzo_bytep out, lzo_uintp out_len,
                          lzo_voidp wrkmem )
 {
-    register lzo_bytep op;
-    register const lzo_bytep ip;
-    register const lzo_bytep m_pos;
+    lzo_bytep op;
+    const lzo_bytep ip;
+    const lzo_bytep m_pos;
 
     lzo_uint t;
     const lzo_bytep const ip_end = in + in_len;
@@ -63,7 +51,7 @@ DO_DECOMPRESS    ( const lzo_bytep in , lzo_uint  in_len,
     lzo_bytep const op_end = out + *out_len;
 #endif
 
-    lzo_uint32 b = 0;       /* bit buffer */
+    lzo_uint32_t b = 0;     /* bit buffer */
     unsigned k = 0;         /* bits in bit buffer */
 
     LZO_UNUSED(wrkmem);
@@ -71,7 +59,7 @@ DO_DECOMPRESS    ( const lzo_bytep in , lzo_uint  in_len,
     op = out;
     ip = in;
 
-    while (TEST_IP && TEST_OP)
+    while (TEST_IP_AND_TEST_OP)
     {
         NEEDBITS(1);
         if (MASKBITS(1) == 0)
@@ -108,7 +96,7 @@ DO_DECOMPRESS    ( const lzo_bytep in , lzo_uint  in_len,
         t >>= 5;
         if (t == 0)
         {
-#if (N >= 8192)
+#if (SWD_N >= 8192)
             NEEDBITS(1);
             t = MASKBITS(1);
             DUMPBITS(1);
@@ -128,6 +116,7 @@ DO_DECOMPRESS    ( const lzo_bytep in , lzo_uint  in_len,
             {
                 t += 255;
                 ip++;
+                TEST_OV(t);
                 NEED_IP(1);
             }
             t += *ip++;