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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=70aeacee9973b8c30157741f69821f04647ff47d
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master-2.4
Repository: wireshark

Commits:

70aeace by Guy Harris (guy@xxxxxxxxxxxx):

    Only use "libpcap" to refer to the library.
    
    For file formats, say "pcap/pcapng" or "pcap and pcapng" instead; this
    code handles both formats.  Use just "pcap_" in structure types.
    
    Change-Id: I2c0e096855ac3736bbfd72480ed4221b3a2f25d1
    Reviewed-on: https://code.wireshark.org/review/29835
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 5773f2bbca29b08dc1987478d8d4ee7ee24b7293)
    Reviewed-on: https://code.wireshark.org/review/29864
    

Actions performed:

    from  9fcd6e4   Sort cases in pcap_get_phdr_size(), add a missing one for WTAP_ENCAP_NFC_LLCP.
     add  70aeace   Only use "libpcap" to refer to the library.


Summary of changes:
 wiretap/pcap-common.c | 98 ++++++++++++++++++++++++++-------------------------
 1 file changed, 50 insertions(+), 48 deletions(-)