diff options
| author | João Valverde <j@v6e.pt> | 2021-11-27 17:57:46 +0000 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-11-28 12:32:51 +0000 |
| commit | ef8125e3aea8a7a364ffd1c154809a10f2f399f5 (patch) | |
| tree | 9b684e559f96cafce8938d1f1819ed2db1d51441 /epan/tvbuff.c | |
| parent | ede0bc5d61a0aadb426f1be605f493d58a68f990 (diff) | |
Move two functions from epan to wsutil/str_util
Move epan_memmem() and epan_strcasestr() to wsutil/str_util.
Rename to ws_memmem() and ws_strcasestr(). Add compile time
check for a system implementation and use that if available.
We invoke those functions using a wrapper to avoid exposing
_GNU_SOURCE outside of the implementation.
Diffstat (limited to 'epan/tvbuff.c')
| -rw-r--r-- | epan/tvbuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/tvbuff.c b/epan/tvbuff.c index 2cbb1b1b3c..dbe469de41 100644 --- a/epan/tvbuff.c +++ b/epan/tvbuff.c @@ -4448,7 +4448,7 @@ tvb_find_tvb(tvbuff_t *haystack_tvb, tvbuff_t *needle_tvb, const gint haystack_o check_offset_length(haystack_tvb, haystack_offset, -1, &haystack_abs_offset, &haystack_abs_length); - location = epan_memmem(haystack_data + haystack_abs_offset, haystack_abs_length, + location = ws_memmem(haystack_data + haystack_abs_offset, haystack_abs_length, needle_data, needle_len); if (location) { |