From 596e0b41d129492d73542c183f3d11a1dce09695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Mon, 26 Dec 2022 04:39:43 +0000 Subject: dfilter: Change two scanner patterns to camel case --- epan/dfilter/scanner.l | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'epan/dfilter') diff --git a/epan/dfilter/scanner.l b/epan/dfilter/scanner.l index 9c27a43a53..7c759d7038 100644 --- a/epan/dfilter/scanner.l +++ b/epan/dfilter/scanner.l @@ -122,11 +122,11 @@ hex4 [[:xdigit:]]{4} QuadMacAddress {hex4}\.{hex4}\.{hex4} DecOctet [0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5] -IPv4address {DecOctet}\.{DecOctet}\.{DecOctet}\.{DecOctet} +IPv4Address {DecOctet}\.{DecOctet}\.{DecOctet}\.{DecOctet} h16 [0-9A-Fa-f]{1,4} -ls32 {h16}:{h16}|{IPv4address} -IPv6address ({h16}:){6}{ls32}|::({h16}:){5}{ls32}|({h16})?::({h16}:){4}{ls32}|(({h16}:){0,1}{h16})?::({h16}:){3}{ls32}|(({h16}:){0,2}{h16})?::({h16}:){2}{ls32}|(({h16}:){0,3}{h16})?::{h16}:{ls32}|(({h16}:){0,4}{h16})?::{ls32}|(({h16}:){0,5}{h16})?::{h16}|(({h16}:){0,6}{h16})?:: +ls32 {h16}:{h16}|{IPv4Address} +IPv6Address ({h16}:){6}{ls32}|::({h16}:){5}{ls32}|({h16})?::({h16}:){4}{ls32}|(({h16}:){0,1}{h16})?::({h16}:){3}{ls32}|(({h16}:){0,2}{h16})?::({h16}:){2}{ls32}|(({h16}:){0,3}{h16})?::{h16}:{ls32}|(({h16}:){0,4}{h16})?::{ls32}|(({h16}:){0,5}{h16})?::{h16}|(({h16}:){0,6}{h16})?:: V4CidrPrefix \/[[:digit:]]{1,2} V6CidrPrefix \/[[:digit:]]{1,3} @@ -422,13 +422,13 @@ HyphenBytes {hex2}(-{hex2})+ return set_lval_simple(yyextra, TOKEN_UNPARSED, yytext, STTYPE_UNINITIALIZED); } -{IPv4address}{V4CidrPrefix}? { +{IPv4Address}{V4CidrPrefix}? { /* IPv4 with or without prefix. */ update_location(yyextra, yytext); return set_lval_simple(yyextra, TOKEN_UNPARSED, yytext, STTYPE_UNINITIALIZED); } -{IPv6address}{V6CidrPrefix}? { +{IPv6Address}{V6CidrPrefix}? { /* IPv6 with or without prefix. */ update_location(yyextra, yytext); return set_lval_simple(yyextra, TOKEN_UNPARSED, yytext, STTYPE_UNINITIALIZED); -- cgit v1.2.3