less: document -S flag and make it independently configurable

[oweals/busybox.git] / archival / libarchive / lzo1x_9x.c

diff --git a/archival/libarchive/lzo1x_9x.c b/archival/libarchive/lzo1x_9x.c
index 897132987c5c3e710066895be46e2bd1a00a395d..09ee4ba5c3b16885bdd3f89e473192d2ff956afd 100644 (file)
--- a/archival/libarchive/lzo1x_9x.c
+++ b/archival/libarchive/lzo1x_9x.c
@@ -71,7 +71,6 @@ typedef struct {
        uint8_t *out;
 
        unsigned r1_lit;
-
 } lzo1x_999_t;
 
 #define getbyte(c)  ((c).ip < (c).in_end ? *((c).ip)++ : (-1))
@@ -94,7 +93,7 @@ typedef struct {
        ( ((0x9f5f * ((((b[p]<<5)^b[p+1])<<5) ^ b[p+2])) >> 5) & (SWD_HSIZE-1) )
 
 #if defined(LZO_UNALIGNED_OK_2)
-#  define HEAD2(b,p)      (* (uint16_t *) &(b[p]))
+#  define HEAD2(b,p)      (* (bb__aliased_uint16_t *) &(b[p]))
 #else
 #  define HEAD2(b,p)      (b[p] ^ ((unsigned)b[p+1]<<8))
 #endif
@@ -466,7 +465,6 @@ static int find_match(lzo1x_999_t *c, lzo_swd_p s,
        }
 
        s->m_len = 1;
-       s->m_len = 1;
 #ifdef SWD_BEST_OFF
        if (s->use_best_off)
                memset(s->best_pos, 0, sizeof(s->best_pos));