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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f7724c319e97e03eac547db410c6971fbb61d68d
Submitter: Jim Young (jim.young.ws@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

f7724c3 by Jim Young (jyoung@xxxxxxx):

    file-pcapng: Undo some unnecessary changes.
    
    In commit 35cf66d8bd2d225ab4dad39f5af5253ab6c8caa9 four existing
    objects were renamed for no good reason.  Restore original names.
    Also remove unnessary Darwin options from packet block options
    and remove leftover include.
    
    Change-Id: I9dfa642639af13e73b519438b82b1b2a77546c7c
    Reviewed-on: https://code.wireshark.org/review/20171
    Petri-Dish: Jim Young <jim.young.ws@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Jim Young <jim.young.ws@xxxxxxxxx>
    

Actions performed:

    from  0a4273f   Only cleanup open_routines if not NULL
    adds  f7724c3   file-pcapng: Undo some unnecessary changes.


Summary of changes:
 epan/dissectors/file-pcapng.c |   31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)