Wireshark-commits: [Wireshark-commits] master-1.12 cfa3bd7: Fix instances of duplicate display-filt

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 3 Dec 2014 16:57:18 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=cfa3bd752eda19cadfa5278c5e16a04796ab399a
Submitter: Bill Meier (wmeier@xxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

cfa3bd7 by Bill Meier (wmeier@xxxxxxxxxxx):

    Fix instances of duplicate display-filter-names with incompatible types.
    
    Backported (with no changes) from master c681091.
    See: https://code.wireshark.org/review/5575
    
    Note: Some of the filters, when/if used, could have caused Wireshark crashes.
    
    Change-Id: I3b5afb8a59f6443624708b9fecfdcbe93dad59ef
    Reviewed-on: https://code.wireshark.org/review/5590
    Reviewed-by: Bill Meier <wmeier@xxxxxxxxxxx>
    

Actions performed:

    from  bb5419b   alljoyn: Rename some filters; Fix some filter types.
    adds  cfa3bd7   Fix instances of duplicate display-filter-names with incompatible types.


Summary of changes:
 epan/dissectors/packet-adwin.c         |    4 ++--
 epan/dissectors/packet-bgp.c           |    4 ++--
 epan/dissectors/packet-h264.c          |   16 ++++++++--------
 plugins/profinet/packet-dcerpc-pn-io.c |   10 +++++-----
 4 files changed, 17 insertions(+), 17 deletions(-)