Wireshark-commits: [Wireshark-commits] master 6f3bcd0: TDS: Fix conflict for hf fields

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 11 Mar 2016 12:41:19 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=6f3bcd01024feb7f1f473d1c0b9e6c1a8b6e1c00
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

6f3bcd0 by Alexis La Goutte (alexis.lagoutte@xxxxxxxxx):

    TDS: Fix conflict for hf fields
    
    'tds.done.donerowcount' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
    'tds.doneproc.donerowcount' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
    'tds.doneinproc.donerowcount' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
    'tds.envchange.newvalue' exists multiple times with NOT compatible types: FT_BYTES and FT_STRING
    'tds.envchange.oldvalue' exists multiple times with NOT compatible types: FT_BYTES and FT_STRING
    
    Change-Id: I87d713aaa722d7ab9e8d19955f3820e9040446c1
    Reviewed-on: https://code.wireshark.org/review/14415
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  f67e7d7   Rename a variable for clarity.
    adds  6f3bcd0   TDS: Fix conflict for hf fields


Summary of changes:
 epan/dissectors/packet-tds.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)