Wireshark-commits: [Wireshark-commits] master fd4d009: ppp: fix conflict for hf field

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: Sun, 26 Feb 2017 23:30:41 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=fd4d009e2edac2e6ad7f703265ac17f25afcf981
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

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

    ppp: fix conflict for hf field
    
    ccp.opt.oui' exists multiple times with NOT compatible types: FT_BYTES and FT_UINT24
    
    Change-Id: If6a3bbaf0012ab41722648a950f7b7007cf9a3b3
    Reviewed-on: https://code.wireshark.org/review/20291
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  2573598   Fix error: extra ';' after member function definition [-Werror,-Wextra-semi]
    adds  fd4d009   ppp: fix conflict for hf field


Summary of changes:
 epan/dissectors/packet-ppp.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)