mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 13:51:26 +02:00
Code Issues Projects Releases Wiki Activity

BUILD: map: fix build warning

Browse Source 
<pattern> field pointer of pat_ref_elt structure has been by a
zero-length array. As such, it's now unneeded to check for NULL address
before printing it.

This type conversion was done in the following commit :
  3ac9912837118a81f3291e106ce9a7c4be6c934f
  OPTIM: pattern: save memory and time using ebst instead of ebis

The current patch is mandatory to fix the following GCC warning :
  CC      src/map.o
  src/map.c: In function ‘cli_io_handler_map_lookup’:
  src/map.c:549:54: error: the comparison will always evaluate as ‘true’ for the address of ‘pattern’ will never be NULL [-Werror=address]
  549 |                                         if (pat->ref && pat->ref->pattern)
      |

No need to backport it unless the above commit is.
This commit is contained in:
Amaury Denoyelle 2023-11-27 14:49:33 +01:00
parent 3ac9912837
commit eabe477ad2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/map.c
View File

@ -546,13 +546,13 @@ static int cli_io_handler_map_lookup(struct appctx *appctx)
/* display pattern */
if (ctx->display_flags == PAT_REF_MAP) {
if (pat->ref && pat->ref->pattern)
if (pat->ref)
chunk_appendf(&trash, ", key=\"%s\"", pat->ref->pattern);
else
chunk_appendf(&trash, ", key=unknown");
}
else {
if (pat->ref && pat->ref->pattern)
if (pat->ref)
chunk_appendf(&trash, ", pattern=\"%s\"", pat->ref->pattern);
else
chunk_appendf(&trash, ", pattern=unknown");