diff options
| author | João Valverde <j@v6e.pt> | 2022-03-16 00:52:03 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2022-03-16 19:28:41 +0000 |
| commit | 5f13127a943b11c14b49f7552ff29bc931cd2297 (patch) | |
| tree | 799f62faa86eb49763bde54bcabe334a09ed36d6 /epan/ftypes | |
| parent | 72751919b27d94b199b898564b0bdc780f6b9fc8 (diff) | |
ftypes: Remove unnecessary macro
Diffstat (limited to 'epan/ftypes')
| -rw-r--r-- | epan/ftypes/ftype-bytes.c | 12 | ||||
| -rw-r--r-- | epan/ftypes/ftype-protocol.c | 4 | ||||
| -rw-r--r-- | epan/ftypes/ftype-string.c | 12 |
3 files changed, 11 insertions, 17 deletions
diff --git a/epan/ftypes/ftype-bytes.c b/epan/ftypes/ftype-bytes.c index 59841fbd4e..a3f2653205 100644 --- a/epan/ftypes/ftype-bytes.c +++ b/epan/ftypes/ftype-bytes.c @@ -16,8 +16,6 @@ #include <epan/osi-utils.h> #include <epan/to_str.h> -#define CMP_MATCHES cmp_matches - static void bytes_fvalue_new(fvalue_t *fv) { @@ -583,7 +581,7 @@ ftype_register_bytes(void) cmp_order, cmp_bitwise_and, cmp_contains, - CMP_MATCHES, + cmp_matches, len, slice, @@ -631,7 +629,7 @@ ftype_register_bytes(void) cmp_order, cmp_bitwise_and, cmp_contains, - CMP_MATCHES, + cmp_matches, len, slice, @@ -655,7 +653,7 @@ ftype_register_bytes(void) cmp_order, cmp_bitwise_and, cmp_contains, - CMP_MATCHES, + cmp_matches, len, slice, @@ -679,7 +677,7 @@ ftype_register_bytes(void) cmp_order, cmp_bitwise_and, cmp_contains, - CMP_MATCHES, + cmp_matches, len, slice, @@ -775,7 +773,7 @@ ftype_register_bytes(void) cmp_order, cmp_bitwise_and, cmp_contains, - CMP_MATCHES, + cmp_matches, len, slice, diff --git a/epan/ftypes/ftype-protocol.c b/epan/ftypes/ftype-protocol.c index 0abe9f151d..7a4ba51798 100644 --- a/epan/ftypes/ftype-protocol.c +++ b/epan/ftypes/ftype-protocol.c @@ -17,8 +17,6 @@ #include <epan/exceptions.h> #include <wsutil/ws_assert.h> -#define CMP_MATCHES cmp_matches - static void value_new(fvalue_t *fv) { @@ -323,7 +321,7 @@ ftype_register_tvbuff(void) cmp_order, NULL, /* cmp_bitwise_and */ cmp_contains, - CMP_MATCHES, + cmp_matches, len, slice, diff --git a/epan/ftypes/ftype-string.c b/epan/ftypes/ftype-string.c index 390cba9345..2cec781cd0 100644 --- a/epan/ftypes/ftype-string.c +++ b/epan/ftypes/ftype-string.c @@ -12,8 +12,6 @@ #include <ftypes-int.h> #include <string.h> -#define CMP_MATCHES cmp_matches - #include <strutil.h> #include <wsutil/ws_assert.h> @@ -177,7 +175,7 @@ ftype_register_string(void) cmp_order, NULL, /* cmp_bitwise_and */ cmp_contains, - CMP_MATCHES, + cmp_matches, len, slice, @@ -200,7 +198,7 @@ ftype_register_string(void) cmp_order, NULL, /* cmp_bitwise_and */ cmp_contains, /* cmp_contains */ - CMP_MATCHES, + cmp_matches, len, slice, @@ -223,7 +221,7 @@ ftype_register_string(void) cmp_order, NULL, /* cmp_bitwise_and */ cmp_contains, /* cmp_contains */ - CMP_MATCHES, + cmp_matches, len, slice, @@ -246,7 +244,7 @@ ftype_register_string(void) cmp_order, NULL, /* cmp_bitwise_and */ cmp_contains, /* cmp_contains */ - CMP_MATCHES, + cmp_matches, len, slice, @@ -269,7 +267,7 @@ ftype_register_string(void) cmp_order, NULL, /* cmp_bitwise_and */ cmp_contains, /* cmp_contains */ - CMP_MATCHES, + cmp_matches, len, slice, |