[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=5aa3a88f1a6d691af234cd12c47ab2ac63de3b17
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

5aa3a88 by Michael Mann (mmann78@xxxxxxxxxxxx):

    Separate hf_ fields that share filter names with FT_UINT32 and FT_UINT64 datatypes.
    
    'bitcoin.addr.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'bitcoin.inv.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'bitcoin.getdata.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'bitcoin.notfound.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'bitcoin.getblocks.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'bitcoin.getheaders.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'bitcoin.tx.input_count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'bitcoin.tx.in.script_length' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'bitcoin.tx.output_count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'bitcoin.tx.out.script_length' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'bitcoin.block.num_transactions' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'bitcoin.headers.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'bitcoin.merkleblock.flags.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'bitcoin.merkleblock.hashes.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'bitcoin.string.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'bitcoin.data.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'dcerpc.referent_id' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'dmp.body.id' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'edonkey.start_offset' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'edonkey.end_offset' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'elf.entry' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'elf.phoff' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'elf.shoff' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'elf.p_offset' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'elf.p_vaddr' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'elf.p_paddr' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'elf.p_filesz' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'elf.p_memsz' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'elf.p_align' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'elf.sh_addr' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'elf.sh_offset' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'elf.sh_size' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'elf.sh_addralign' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'elf.sh_entsize' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'elf.symbol_table.value' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'elf.symbol_table.size' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'elf.dynamic.tag' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'elf.dynamic.value' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'elf.dynamic.pointer' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'elf.dynamic.ignored' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'elf.dynamic.unspecified' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'h248.contextId' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'hcrt.data32' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'wlan_mgt.fixed.psmp.stainfo.reserved' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'isakmp.tf.attr.life_duration' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'isakmp.ike.attr.life_duration' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'jxta.message.element.content.length' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'rmt-lct.tsi' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'rmt-lct.toi' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'smb.alloc_size' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    'trmac.response_code' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    
    Change-Id: I903933e6448bac3d3374eef1a6a0bc4771c1a9f4
    Reviewed-on: https://code.wireshark.org/review/14060
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  d1f5b37   Resolve hf_ field name conflicts with protocol strings.
    adds  5aa3a88   Separate hf_ fields that share filter names with FT_UINT32 and FT_UINT64 datatypes.


Summary of changes:
 asn1/h248/packet-h248-template.c   |    2 +-
 epan/dissectors/file-elf.c         |   42 ++++++++++++++++++------------------
 epan/dissectors/packet-bitcoin.c   |   32 +++++++++++++--------------
 epan/dissectors/packet-dcerpc.c    |    4 ++--
 epan/dissectors/packet-dmp.c       |    8 +++----
 epan/dissectors/packet-edonkey.c   |    4 ++--
 epan/dissectors/packet-h248.c      |    2 +-
 epan/dissectors/packet-hcrt.c      |    2 +-
 epan/dissectors/packet-ieee80211.c |    2 +-
 epan/dissectors/packet-isakmp.c    |    8 +++----
 epan/dissectors/packet-jxta.c      |    2 +-
 epan/dissectors/packet-rmt-lct.c   |    6 +++---
 epan/dissectors/packet-smb.c       |    2 +-
 epan/dissectors/packet-trmac.c     |    2 +-
 14 files changed, 59 insertions(+), 59 deletions(-)