Wireshark-commits: [Wireshark-commits] master 361ea82: Add support for multifields in custom column

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 18 Dec 2014 11:03:45 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=361ea8215d1e39a51579b45eadbedd8288d14b20
Submitter: Michal Labedzki (michal.labedzki@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

361ea82 by Michal Labedzki (michal.labedzki@xxxxxxxxx):

    Add support for multifields in custom column
    
    You can now add column with Custom type with more than one field
    by using OR "||" splitter.
    
    Bug: 9695
    
    Change-Id: Ia82a91e7a35b867647d36cb9626e3870f46c0d85
    Reviewed-on: https://code.wireshark.org/review/5804
    Petri-Dish: Michal Labedzki <michal.labedzki@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Reviewed-by: Michal Labedzki <michal.labedzki@xxxxxxxxx>
    

Actions performed:

    from  f5cd215   Bluetooth: Add generic Bluetooth dissector
    adds  361ea82   Add support for multifields in custom column


Summary of changes:
 epan/column-info.h  |    2 +-
 epan/column-utils.c |   51 ++++-
 epan/epan.c         |    4 +-
 epan/epan.h         |    2 +-
 epan/proto.c        |  525 ++++++++++++++++++++++++++-------------------------
 epan/proto.h        |    2 +-
 6 files changed, 313 insertions(+), 273 deletions(-)