Skip to content

next/1357/20260520/v1#466

Merged
victorjulien merged 1 commit into
OISF:0.5.xfrom
victorjulien:next/1357/20260520/v1
May 20, 2026
Merged

next/1357/20260520/v1#466
victorjulien merged 1 commit into
OISF:0.5.xfrom
victorjulien:next/1357/20260520/v1

Conversation

@victorjulien
Copy link
Copy Markdown
Member

If c11 is not available, use gnu99 and suppress c11-extensions warnings.

To address:

htp_util.c:623:32: warning: '_Generic' is a C11 extension [-Wc11-extensions]
  623 |         unsigned char *colon = memchr(data, ':', len);
      |                                ^
/usr/include/string.h:122:3: note: expanded from macro 'memchr'
  122 |   __glibc_const_generic (S, const void *, memchr (S, C, N))
      |   ^
/usr/include/x86_64-linux-gnu/sys/cdefs.h:838:3: note: expanded from macro '__glibc_const_generic'
  838 |   _Generic (0 ? (PTR) : (void *) 1,                     \
      |   ^
htp_util.c:799:32: warning: '_Generic' is a C11 extension [-Wc11-extensions]
  799 |             unsigned char *m = memchr(data + start, '@', pos - start);
      |                                ^
/usr/include/string.h:122:3: note: expanded from macro 'memchr'
  122 |   __glibc_const_generic (S, const void *, memchr (S, C, N))
      |   ^
/usr/include/x86_64-linux-gnu/sys/cdefs.h:838:3: note: expanded from macro '__glibc_const_generic'
  838 |   _Generic (0 ? (PTR) : (void *) 1,                     \
      |   ^
htp_util.c:810:21: warning: '_Generic' is a C11 extension [-Wc11-extensions]
  810 |                 m = memchr(credentials_start, ':', credentials_len);
      |                     ^
/usr/include/string.h:122:3: note: expanded from macro 'memchr'
  122 |   __glibc_const_generic (S, const void *, memchr (S, C, N))
      |   ^
/usr/include/x86_64-linux-gnu/sys/cdefs.h:838:3: note: expanded from macro '__glibc_const_generic'
  838 |   _Generic (0 ? (PTR) : (void *) 1,                     \
      |   ^
htp_util.c:832:21: warning: '_Generic' is a C11 extension [-Wc11-extensions]
  832 |                 m = memchr(hostname_start, ']', hostname_len);
      |                     ^
/usr/include/string.h:122:3: note: expanded from macro 'memchr'
  122 |   __glibc_const_generic (S, const void *, memchr (S, C, N))
      |   ^
/usr/include/x86_64-linux-gnu/sys/cdefs.h:838:3: note: expanded from macro '__glibc_const_generic'
  838 |   _Generic (0 ? (PTR) : (void *) 1,                     \
      |   ^
htp_util.c:846:25: warning: '_Generic' is a C11 extension [-Wc11-extensions]
  846 |                     m = memchr(hostname_start, ':', hostname_len);
      |                         ^
/usr/include/string.h:122:3: note: expanded from macro 'memchr'
  122 |   __glibc_const_generic (S, const void *, memchr (S, C, N))
      |   ^
/usr/include/x86_64-linux-gnu/sys/cdefs.h:838:3: note: expanded from macro '__glibc_const_generic'
  838 |   _Generic (0 ? (PTR) : (void *) 1,                     \
      |   ^
htp_util.c:856:21: warning: '_Generic' is a C11 extension [-Wc11-extensions]
  856 |                 m = memchr(hostname_start, ':', hostname_len);
      |                     ^
/usr/include/string.h:122:3: note: expanded from macro 'memchr'
  122 |   __glibc_const_generic (S, const void *, memchr (S, C, N))
      |   ^
/usr/include/x86_64-linux-gnu/sys/cdefs.h:838:3: note: expanded from macro '__glibc_const_generic'
  838 |   _Generic (0 ? (PTR) : (void *) 1,                     \
      |   ^
6 warnings generated.
Copy link
Copy Markdown
Member

@jasonish jasonish left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Matches hash of already approved PR.

@suricata-qa
Copy link
Copy Markdown

WARNING:

field baseline test %
SURI_TLPR1_stats_chk
.app_layer.flow.ftp-data 604 570 94.37%

Pipeline = 31635

@victorjulien victorjulien merged commit 2f29bd0 into OISF:0.5.x May 20, 2026
10 checks passed
@victorjulien victorjulien deleted the next/1357/20260520/v1 branch May 20, 2026 17:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants