Rename FIELDBASE to FIELDDISPLAY, as it's a "how to display this"

indication, not necessarily a base (the base is "how to display" some
numeric fields, but it's not how to display some other fields).

Note that FIELDDISPLAY is the number of bits in the field containing an
FT_BOOLEAN bitfield.

svn path=/trunk/; revision=32480
This commit is contained in:
Guy Harris 2010-04-15 20:54:27 +00:00
parent 4327e29ce9
commit fd29d27282
1 changed files with 7 additions and 2 deletions

View File

@ -931,7 +931,7 @@ proto_register_PROTOABBREV(void)
static hf_register_info hf[] = {
{ &hf_PROTOABBREV_FIELDABBREV,
{ "FIELDNAME", "PROTOABBREV.FIELDABBREV",
FIELDTYPE, FIELDBASE, FIELDCONVERT, BITMASK,
FIELDTYPE, FIELDDISPLAY, FIELDCONVERT, BITMASK,
"FIELDDESCR", HFILL }
}
};
@ -1085,7 +1085,7 @@ FIELDTYPE FT_NONE, FT_BOOLEAN, FT_UINT8, FT_UINT16, FT_UINT24,
FT_RELATIVE_TIME, FT_STRING, FT_STRINGZ, FT_EBCDIC,
FT_UINT_STRING, FT_ETHER, FT_BYTES, FT_UINT_BYTES, FT_IPv4,
FT_IPv6, FT_IPXNET, FT_FRAMENUM, FT_PROTOCOL, FT_GUID, FT_OID
FIELDBASE For FT_UINT{8,16,24,32} and FT_INT{8,16,24,32):
FIELDDISPLAY For FT_UINT{8,16,24,32} and FT_INT{8,16,24,32):
BASE_DEC, BASE_HEX, BASE_OCT, BASE_DEC_HEX, BASE_HEX_DEC,
or BASE_CUSTOM, possibly ORed with BASE_RANGE_STRING
@ -1095,6 +1095,11 @@ FIELDBASE For FT_UINT{8,16,24,32} and FT_INT{8,16,24,32):
ABSOLUTE_TIME_LOCAL, ABSOLUTE_TIME_UTC, or
ABSOLUTE_TIME_DOY_UTC
For FT_BOOLEAN if BITMASK is non-zero:
Number of bits in the field containing the FT_BOOLEAN
bitfield
For all other types:
BASE_NONE