diff options
| author | Guy Harris <guy@alum.mit.edu> | 2020-04-27 21:30:53 -0700 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2020-04-28 06:05:52 +0000 |
| commit | e4aeb1d2bb4a2f0559f6ee938de45b7f42d82fa3 (patch) | |
| tree | be898ff66f97f093a0d03306e59643fea95a8486 /epan/tvbuff.c | |
| parent | 9eaf9a5648adaef573c45ab9c4a2e31bb31f81df (diff) | |
Clean up the encoding value definitions.
Group them by the data types for which they're used, starting with the
byte-order definitions which (with the inclusion of ENC_NA) are used
with all types.
Put all the ones used for strings together, starting with the character
encodings, with the Zigbee flag and the flags for "this is a string but
we're going to interpret it as a byte array or time stamp".
Make ENC_CHARENCODING_MASK equal to ENC_STR_MASK; no, there's no reason
for ENC_STR_MASK to replace ENC_CHARENCODING_MASK - the opposite should
happen, as ENC_CHARENCODING_MASK at least specifies what the bits set in
it are used for, namely character encodings. If all #defines for
strings should have _STR_ in them, start with the character encoings.
Change-Id: I072420f313086153b4ea4034911fc293453dea00
Reviewed-on: https://code.wireshark.org/review/36962
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>
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 3aa4397616..9352a6f73e 100644 --- a/epan/tvbuff.c +++ b/epan/tvbuff.c @@ -1600,7 +1600,7 @@ tvb_get_letohieee_double(tvbuff_t *tvb, const int offset) static inline void validate_single_byte_ascii_encoding(const guint encoding) { - const guint enc = encoding & ~ENC_STR_MASK; + const guint enc = encoding & ~ENC_CHARENCODING_MASK; switch (enc) { case ENC_UTF_16: |