mirror of
https://github.com/fluencelabs/redis
synced 2025-03-30 22:31:03 +00:00
Try to avoid issues with GCC pragmas and older compilers.
See issue #5394.
This commit is contained in:
parent
5aa347b377
commit
08c26591e3
11
src/lzf_d.c
11
src/lzf_d.c
@ -52,6 +52,10 @@
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(__GNUC__) && __GNUC__ >= 5
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
|
||||||
|
#endif
|
||||||
unsigned int
|
unsigned int
|
||||||
lzf_decompress (const void *const in_data, unsigned int in_len,
|
lzf_decompress (const void *const in_data, unsigned int in_len,
|
||||||
void *out_data, unsigned int out_len)
|
void *out_data, unsigned int out_len)
|
||||||
@ -86,8 +90,6 @@ lzf_decompress (const void *const in_data, unsigned int in_len,
|
|||||||
#ifdef lzf_movsb
|
#ifdef lzf_movsb
|
||||||
lzf_movsb (op, ip, ctrl);
|
lzf_movsb (op, ip, ctrl);
|
||||||
#else
|
#else
|
||||||
#pragma GCC diagnostic push
|
|
||||||
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
|
|
||||||
switch (ctrl)
|
switch (ctrl)
|
||||||
{
|
{
|
||||||
case 32: *op++ = *ip++; case 31: *op++ = *ip++; case 30: *op++ = *ip++; case 29: *op++ = *ip++;
|
case 32: *op++ = *ip++; case 31: *op++ = *ip++; case 30: *op++ = *ip++; case 29: *op++ = *ip++;
|
||||||
@ -99,7 +101,6 @@ lzf_decompress (const void *const in_data, unsigned int in_len,
|
|||||||
case 8: *op++ = *ip++; case 7: *op++ = *ip++; case 6: *op++ = *ip++; case 5: *op++ = *ip++;
|
case 8: *op++ = *ip++; case 7: *op++ = *ip++; case 6: *op++ = *ip++; case 5: *op++ = *ip++;
|
||||||
case 4: *op++ = *ip++; case 3: *op++ = *ip++; case 2: *op++ = *ip++; case 1: *op++ = *ip++;
|
case 4: *op++ = *ip++; case 3: *op++ = *ip++; case 2: *op++ = *ip++; case 1: *op++ = *ip++;
|
||||||
}
|
}
|
||||||
#pragma GCC diagnostic pop
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
else /* back reference */
|
else /* back reference */
|
||||||
@ -185,4 +186,6 @@ lzf_decompress (const void *const in_data, unsigned int in_len,
|
|||||||
|
|
||||||
return op - (u8 *)out_data;
|
return op - (u8 *)out_data;
|
||||||
}
|
}
|
||||||
|
#if defined(__GNUC__) && __GNUC__ >= 5
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user