Wireshark-commits: [Wireshark-commits] master bd91109: Added JSON native file support.
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 17 Feb 2015 11:08:57 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=bd911096bd469b70ffedef409746cff8bce68c8a
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

bd91109 by Dario Lombardo (lomato@xxxxxxxxx):

    Added JSON native file support.
    
    libjsmn has also been moved from epan/ to wsutil/ to make it visible from wiretap.
    
    Change-Id: I59abb3419acb1baa83194b38152d3651ed5c123c
    Bug: 10878
    Reviewed-on: https://code.wireshark.org/review/6716
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    

Actions performed:

    from  1478db0   Fix up formatting and indentation a bit.
    adds  bd91109   Added JSON native file support.


Summary of changes:
 configure.ac                       |    1 -
 epan/CMakeLists.txt                |   14 +-
 epan/Makefile.am                   |    6 +-
 epan/Makefile.nmake                |   24 +--
 epan/dissectors/packet-json.c      |   32 ++-
 epan/jsmn/Makefile.am              |   63 ------
 epan/jsmn/Makefile.common          |   38 ----
 epan/jsmn/Makefile.nmake           |   44 ----
 epan/jsmn/jsmn.c                   |  345 --------------------------------
 wiretap/CMakeLists.txt             |    1 +
 wiretap/Makefile.common            |    1 +
 wiretap/file_access.c              |    8 +
 wiretap/json.c                     |  138 +++++++++++++
 epan/crc10-tvb.c => wiretap/json.h |   40 ++--
 wiretap/wtap.c                     |    3 +
 wiretap/wtap.h                     |    2 +
 wsutil/CMakeLists.txt              |    1 +
 wsutil/Makefile.common             |    2 +
 wsutil/jsmn.c                      |  387 ++++++++++++++++++++++++++++++++++++
 {epan/jsmn => wsutil}/jsmn.h       |   56 +++---
 20 files changed, 628 insertions(+), 578 deletions(-)
 delete mode 100644 epan/jsmn/Makefile.am
 delete mode 100644 epan/jsmn/Makefile.common
 delete mode 100644 epan/jsmn/Makefile.nmake
 delete mode 100644 epan/jsmn/jsmn.c
 create mode 100644 wiretap/json.c
 copy epan/crc10-tvb.c => wiretap/json.h (59%)
 create mode 100644 wsutil/jsmn.c
 rename {epan/jsmn => wsutil}/jsmn.h (70%)