RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: compression: remove calls to SLZ init functions 

As we now embed the library we don't need to support the older 1.0 API
any more, so we can remove the explicit calls to slz_make_crc_table()
and slz_prepare_dist_table().
This commit is contained in:
Willy Tarreau 2021-04-22 14:43:49 +02:00
parent aca389a483
commit 5e65f4276b
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/import/slz.h
View File

@ -84,13 +84,11 @@ struct slz_stream {
}; };
/* Functions specific to rfc1951 (deflate) */ /* Functions specific to rfc1951 (deflate) */
void slz_prepare_dist_table(); /* obsolete, not needed anymore */
long slz_rfc1951_encode(struct slz_stream *strm, unsigned char *out, const unsigned char *in, long ilen, int more); long slz_rfc1951_encode(struct slz_stream *strm, unsigned char *out, const unsigned char *in, long ilen, int more);
int slz_rfc1951_init(struct slz_stream *strm, int level); int slz_rfc1951_init(struct slz_stream *strm, int level);
int slz_rfc1951_finish(struct slz_stream *strm, unsigned char *buf); int slz_rfc1951_finish(struct slz_stream *strm, unsigned char *buf);
/* Functions specific to rfc1952 (gzip) */ /* Functions specific to rfc1952 (gzip) */
void slz_make_crc_table(void); /* obsolete, not needed anymore */
uint32_t slz_crc32_by1(uint32_t crc, const unsigned char *buf, int len); uint32_t slz_crc32_by1(uint32_t crc, const unsigned char *buf, int len);
uint32_t slz_crc32_by4(uint32_t crc, const unsigned char *buf, int len); uint32_t slz_crc32_by4(uint32_t crc, const unsigned char *buf, int len);
long slz_rfc1952_encode(struct slz_stream *strm, unsigned char *out, const unsigned char *in, long ilen, int more); long slz_rfc1952_encode(struct slz_stream *strm, unsigned char *out, const unsigned char *in, long ilen, int more);

5
src/compression.c
View File

@ -708,11 +708,6 @@ INITCALL1(STG_REGISTER, cfg_register_keywords, &cfg_kws);
__attribute__((constructor)) __attribute__((constructor))
static void __comp_fetch_init(void) static void __comp_fetch_init(void)
{ {
#ifdef USE_SLZ
slz_make_crc_table();
slz_prepare_dist_table();
#endif
#if defined(USE_ZLIB) && defined(DEFAULT_MAXZLIBMEM) #if defined(USE_ZLIB) && defined(DEFAULT_MAXZLIBMEM)
global.maxzlibmem = DEFAULT_MAXZLIBMEM * 1024U * 1024U; global.maxzlibmem = DEFAULT_MAXZLIBMEM * 1024U * 1024U;
#endif #endif

12
src/slz.c
View File

@ -1304,18 +1304,6 @@ int slz_rfc1950_finish(struct slz_stream *strm, unsigned char *buf)
return strm->outbuf - buf; return strm->outbuf - buf;
} }
/* This used to be the function called to build the CRC table at init time.
* Now it does nothing, it's only kept for API/ABI compatibility.
*/
void slz_make_crc_table(void)
{
}
/* does nothing anymore, only kept for ABI compatibility */
void slz_prepare_dist_table()
{
}
__attribute__((constructor)) __attribute__((constructor))
static void __slz_initialize(void) static void __slz_initialize(void)
{ {