Wireshark-commits: [Wireshark-commits] master 7c3fd2a: Revert "Revert "Fix duplicate Display Filter

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: Mon, 16 Feb 2015 03:13:36 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7c3fd2a6903ced8adb89659a4105d22031442edf
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

7c3fd2a by Guy Harris (guy@xxxxxxxxxxxx):

    Revert "Revert "Fix duplicate Display Filter Macro check""
    
    This reverts commit 876c322df8b6a944cb4358c313c4fc46afe99719.
    
    Wrong branch.  It builds in master; it does *not* build in 1.12 or 1.10.
    
    Change-Id: I3a2409d5a37f08965d6caac64dc97a48a1c5d1b8
    Reviewed-on: https://code.wireshark.org/review/7152
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  876c322   Revert "Fix duplicate Display Filter Macro check"
    adds  7c3fd2a   Revert "Revert "Fix duplicate Display Filter Macro check""


Summary of changes:
 epan/dfilter/dfilter-macro.c |   35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)