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

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

Commits:

2fcc8b8 by Michael Mann (mmann78@xxxxxxxxxxxx):

    Fix duplicate Display Filter Macro check
    
    Since commit 4a1bd75b60171d781dc9f2d3ffd6d498acc74b1a
    (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7471), the data
    pointer does not match anything from the macros array.
    
    This patch fixes a false warning by checking for duplicates before the
    name is committed.
    
    Bug: 10957
    Change-Id: Id61110bf63de1de80b85524705a2df6a5e7be33a
    Reviewed-on: https://code.wireshark.org/review/7119
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    Reviewed-on: https://code.wireshark.org/review/7146
    Reviewed-on: https://code.wireshark.org/review/7148
    

Actions performed:

    from  56552b7   Don't base interpretation of LINKTYPE_ values on DLT_ value definitions.
    adds  2fcc8b8   Fix duplicate Display Filter Macro check


Summary of changes:
 epan/dfilter/dfilter-macro.c |   29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)