diff options
| author | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-12-23 14:06:25 +0100 |
|---|---|---|
| committer | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-12-23 14:06:25 +0100 |
| commit | 79a9578a33ecd3093970bd18df677edc9214fafb (patch) | |
| tree | 8ae5c6780a1fcd2124e71f27ad9b4256acd24268 /src/lzo1x_oo.ch | |
| parent | 1bb1ce141783168d44a38cd1bb6b822eb13114fc (diff) | |
| download | lzo-79a9578a33ecd3093970bd18df677edc9214fafb.tar.gz lzo-79a9578a33ecd3093970bd18df677edc9214fafb.tar.bz2 lzo-79a9578a33ecd3093970bd18df677edc9214fafb.zip | |
Imported Upstream version 2.08upstream/2.08sandbox/kevinthierry/upstream
Diffstat (limited to 'src/lzo1x_oo.ch')
| -rw-r--r-- | src/lzo1x_oo.ch | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/lzo1x_oo.ch b/src/lzo1x_oo.ch index e978f39..ebb406f 100644 --- a/src/lzo1x_oo.ch +++ b/src/lzo1x_oo.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 @@ -40,6 +28,7 @@ #define TEST_IP (ip < ip_end) #define TEST_OP (op <= op_end) +#define TEST_IP_AND_TEST_OP (TEST_IP && TEST_OP) #define NO_LIT LZO_UINT_MAX @@ -118,7 +107,7 @@ DO_OPTIMIZE ( lzo_bytep in , lzo_uint in_len, } assert(*ip < 16 || (*ip == 17 && in_len == 3)); - while (TEST_IP && TEST_OP) + while (TEST_IP_AND_TEST_OP) { t = *ip++; if (t >= 16) @@ -339,7 +328,7 @@ match_done: match_next: do *op++ = *ip++; while (--t > 0); t = *ip++; - } while (TEST_IP && TEST_OP); + } while (TEST_IP_AND_TEST_OP); } /* no EOF code was found */ |