summaryrefslogtreecommitdiff
path: root/src/lzo_mchw.ch
diff options
context:
space:
mode:
authorKévin THIERRY <kevin.thierry@open.eurogiciel.org>2014-12-23 14:06:25 +0100
committerKévin THIERRY <kevin.thierry@open.eurogiciel.org>2014-12-23 14:06:25 +0100
commit79a9578a33ecd3093970bd18df677edc9214fafb (patch)
tree8ae5c6780a1fcd2124e71f27ad9b4256acd24268 /src/lzo_mchw.ch
parent1bb1ce141783168d44a38cd1bb6b822eb13114fc (diff)
downloadlzo-79a9578a33ecd3093970bd18df677edc9214fafb.tar.gz
lzo-79a9578a33ecd3093970bd18df677edc9214fafb.tar.bz2
lzo-79a9578a33ecd3093970bd18df677edc9214fafb.zip
Imported Upstream version 2.08upstream/2.08sandbox/kevinthierry/upstream
Diffstat (limited to 'src/lzo_mchw.ch')
-rw-r--r--src/lzo_mchw.ch45
1 files changed, 14 insertions, 31 deletions
diff --git a/src/lzo_mchw.ch b/src/lzo_mchw.ch
index a8c4fec..8273612 100644
--- a/src/lzo_mchw.ch
+++ b/src/lzo_mchw.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
@@ -44,7 +32,7 @@
typedef struct
{
- int init;
+ unsigned init;
lzo_uint look; /* bytes in lookahead buffer */
@@ -112,15 +100,7 @@ typedef struct
LZO_COMPRESS_T;
-#if (LZO_CC_BORLANDC && LZO_ARCH_I086) && (__BORLANDC__ < 0x0450)
- /* work around a Borland C 3.1 bug */
-# define getbyte(c) ((c).ip < (c).in_end ? (c).ip +=1, (c).ip[-1] : (-1))
-#elif defined(__TURBOC__) && defined(__TOS__)
- /* work around a bug in Turbo C / Pure C (Atari ST) */
-# define getbyte(c) ((c).ip < (c).in_end ? (int)(unsigned) *((c).ip)++ : (-1))
-#else
-# define getbyte(c) ((c).ip < (c).in_end ? *((c).ip)++ : (-1))
-#endif
+#define getbyte(c) ((c).ip < (c).in_end ? *((c).ip)++ : (-1))
#include "lzo_swd.ch"
@@ -132,7 +112,7 @@ LZO_COMPRESS_T;
static int
init_match ( LZO_COMPRESS_T *c, lzo_swd_p s,
const lzo_bytep dict, lzo_uint dict_len,
- lzo_uint32 flags )
+ lzo_uint32_t flags )
{
int r;
@@ -148,11 +128,14 @@ init_match ( LZO_COMPRESS_T *c, lzo_swd_p s,
c->lazy = 0;
r = swd_init(s,dict,dict_len);
- if (r != 0)
+ if (r != LZO_E_OK)
+ {
+ swd_exit(s);
return r;
+ }
s->use_best_off = (flags & 1) ? 1 : 0;
- return r;
+ return LZO_E_OK;
}
@@ -178,8 +161,8 @@ find_match ( LZO_COMPRESS_T *c, lzo_swd_p s,
c->textsize += this_len - skip;
}
- s->m_len = 1;
- s->m_len = THRESHOLD;
+ s->m_len = SWD_THRESHOLD;
+ s->m_off = 0;
#ifdef SWD_BEST_OFF
if (s->use_best_off)
lzo_memset(s->best_pos,0,sizeof(s->best_pos));
@@ -204,14 +187,14 @@ find_match ( LZO_COMPRESS_T *c, lzo_swd_p s,
#if 0
/* brute force match search */
- if (c->m_len > THRESHOLD && c->m_len + 1 <= c->look)
+ if (c->m_len > SWD_THRESHOLD && c->m_len + 1 <= c->look)
{
const lzo_bytep ip = c->bp;
const lzo_bytep m = c->bp - c->m_off;
const lzo_bytep in = c->in;
- if (ip - in > N)
- in = ip - N;
+ if (ip - in > s->swd_n)
+ in = ip - s->swd_n;
for (;;)
{
while (*in != *ip)