diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-07-02 21:42:07 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-07-02 21:42:07 +0200 |
| commit | 21c3e54010129b504891e1786bf425d89328c969 (patch) | |
| tree | 2e3eba26f5f0fa454188e1b52c7cab3761c4f208 /lzo/src/lzo1b_sm.ch | |
| parent | d4a1b52faa85df4446560a48c6bcc57f016e0c3c (diff) | |
| parent | b42eacfa8da0a642d629714f188cc0fc4c7e601a (diff) | |
Merge
Diffstat (limited to 'lzo/src/lzo1b_sm.ch')
| -rw-r--r-- | lzo/src/lzo1b_sm.ch | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lzo/src/lzo1b_sm.ch b/lzo/src/lzo1b_sm.ch index aa67f219..89ba3a77 100644 --- a/lzo/src/lzo1b_sm.ch +++ b/lzo/src/lzo1b_sm.ch @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -79,7 +82,7 @@ const lzo_bytep ip_sav; unsigned j = DD_SIZE; lzo_uint x_len; - lzo_uint x_off; + LZO_DEFINE_UNINITIALIZED_VAR(lzo_uint, x_off, 0); DVAL_ASSERT(dv,ip); @@ -89,10 +92,10 @@ #if !defined(NDEBUG) const lzo_bytep z_pos = NULL; #endif -#if defined(LZO_DICT_USE_PTR) +#if (LZO_DICT_USE_PTR) m_pos = *d; assert((z_pos = m_pos) == *d); -#if defined(LZO_DETERMINISTIC) +#if (LZO_DETERMINISTIC) assert(m_pos == NULL || m_pos >= in); assert(m_pos == NULL || m_pos < ip); #endif @@ -111,7 +114,7 @@ ((void)(0)); else if (*m_pos++ == *ip++ && *m_pos++ == *ip++ && *m_pos++ == *ip++) { -#if !defined(LZO_DICT_USE_PTR) +#if !(LZO_DICT_USE_PTR) assert((z_pos = ip - 3 - x_off) == (m_pos - 3)); #endif /* a match */ |