RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-09 07:09:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: tools: do not needlessly include xxhash nor cli from tools.h

Browse Source 
These includes brought by commit 9c76637ff ("MINOR: anon: add new macros
and functions to anonymize contents") resulted in an increase of exactly
20% of the number of lines to build. These include are not needed there,
only tools.c needs xxhash.h.
This commit is contained in:
Willy Tarreau 2022-11-24 08:09:12 +01:00
parent 07a3d539f5
commit 08093cc0fa
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/haproxy/tools.h
View File

@ -45,8 +45,6 @@
#include <haproxy/namespace-t.h>
#include <haproxy/protocol-t.h>
#include <haproxy/tools-t.h>
#include <haproxy/xxhash.h>
#include <haproxy/cli.h>
/****** string-specific macros and functions ******/
/* if a > max, then bound <a> to <max>. The macro returns the new <a> */
@ -57,9 +55,6 @@
#define SWAP(a, b) do { typeof(a) t; t = a; a = b; b = t; } while(0)
/* return the hash of a string and length for a given key. All keys are valid. */
#define HA_ANON(key, str, len) (XXH32(str, len, key) & 0xFFFFFF)
/* use if you want to return a simple hash. Key 0 doesn't hash. */
#define HA_ANON_STR(key, str) hash_anon(key, str, "", "")

4
src/tools.c
View File

@ -69,6 +69,7 @@ extern void *__elf_aux_vector;
#include <haproxy/stconn.h>
#include <haproxy/task.h>
#include <haproxy/tools.h>
#include <haproxy/xxhash.h>
/* This macro returns false if the test __x is false. Many
* of the following parsing function must be abort the processing
@ -79,6 +80,9 @@ extern void *__elf_aux_vector;
/* Define the number of line of hash_word */
#define NB_L_HASH_WORD 15
/* return the hash of a string and length for a given key. All keys are valid. */
#define HA_ANON(key, str, len) (XXH32(str, len, key) & 0xFFFFFF)
/* enough to store NB_ITOA_STR integers of :
* 2^64-1 = 18446744073709551615 or
* -2^63 = -9223372036854775808