diff options
| author | Michal Labedzki <michal.labedzki@tieto.com> | 2014-12-17 11:38:49 +0100 |
|---|---|---|
| committer | Michal Labedzki <michal.labedzki@tieto.com> | 2014-12-18 11:03:42 +0000 |
| commit | 361ea8215d1e39a51579b45eadbedd8288d14b20 (patch) | |
| tree | 12b4b8fd9357743f45c3a5f510e16218b683dd54 /epan/epan.c | |
| parent | f5cd21543d332f6c14da88ebd50730750f791dd4 (diff) | |
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@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Diffstat (limited to 'epan/epan.c')
| -rw-r--r-- | epan/epan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/epan.c b/epan/epan.c index 2d5ebfe21d..230eebeff3 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -424,12 +424,12 @@ epan_dissect_prime_dfilter(epan_dissect_t *edt, const dfilter_t* dfcode) /* ----------------------- */ const gchar * -epan_custom_set(epan_dissect_t *edt, int field_id, +epan_custom_set(epan_dissect_t *edt, GSList *field_ids, gint occurrence, gchar *result, gchar *expr, const int size ) { - return proto_custom_set(edt->tree, field_id, occurrence, result, expr, size); + return proto_custom_set(edt->tree, field_ids, occurrence, result, expr, size); } void |