Wireshark-commits: [Wireshark-commits] master-2.6 d8f2788: Sort cases in pcap_get_phdr_size(), add

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, 26 Sep 2018 17:56:15 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d8f278829f9cc620c18536bed113973e08e2656d
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

d8f2788 by Guy Harris (guy@xxxxxxxxxxxx):

    Sort cases in pcap_get_phdr_size(), add a missing one for WTAP_ENCAP_NFC_LLCP.
    
    Sort the cases to match the order in other routines.
    
    That turned up a missing case for WTAP_ENCAP_NFC_LLCP, so add it.
    
    Change-Id: I500731322ae93c6d2efc368f16cf468f589910f3
    Reviewed-on: https://code.wireshark.org/review/29858
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 0a19ec761d68b4a52a4bbfe994503d3d09dbd245)
    Reviewed-on: https://code.wireshark.org/review/29859
    

Actions performed:

    from  f6c2376   PCP: Add padding for option
     add  d8f2788   Sort cases in pcap_get_phdr_size(), add a missing one for WTAP_ENCAP_NFC_LLCP.


Summary of changes:
 wiretap/pcap-common.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)