diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-06-01 16:29:17 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-06-03 02:27:00 +0000 |
| commit | ec3f923e3e693a3ca469bb7073a8c9ce2c33cb7d (patch) | |
| tree | 0c22e44bfe372915d7831e8fde1c74504b480075 /epan | |
| parent | 32177ceec8aedc9130f95e4ead34d5b5155ea17d (diff) | |
| download | wireshark-ec3f923e3e693a3ca469bb7073a8c9ce2c33cb7d.tar.gz wireshark-ec3f923e3e693a3ca469bb7073a8c9ce2c33cb7d.tar.bz2 wireshark-ec3f923e3e693a3ca469bb7073a8c9ce2c33cb7d.zip | |
Add the Display Filter Expression dialog.
Changes from the GTK+ UI:
- The display filter is built on the fly with immediate syntax feedback.
- Slightly different layout.
- You can search for fields.
Make the plain SyntaxLineEdit a bit more plain.
Bug: 11128
Change-Id: I06a48cd7b9ba7b9dc193b0199540aede4eb62fa7
Reviewed-on: https://code.wireshark.org/review/8742
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/range.c | 2 | ||||
| -rw-r--r-- | epan/range.h | 10 | ||||
| -rw-r--r-- | epan/tfs.h | 10 |
3 files changed, 19 insertions, 3 deletions
diff --git a/epan/range.c b/epan/range.c index cc58292f73..07406c138e 100644 --- a/epan/range.c +++ b/epan/range.c @@ -323,7 +323,7 @@ range_foreach(range_t *range, void (*callback)(guint32 val)) /* This function converts a range_t to a (wmem-allocated) string. */ char * -range_convert_range(wmem_allocator_t *scope, range_t *range) +range_convert_range(wmem_allocator_t *scope, const range_t *range) { guint32 i; gboolean prepend_comma = FALSE; diff --git a/epan/range.h b/epan/range.h index a7b8f5c748..f4c5549a0d 100644 --- a/epan/range.h +++ b/epan/range.h @@ -30,6 +30,10 @@ #include "ws_symbol_export.h" #include <epan/wmem/wmem.h> +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + /** @file * Range strings a variant of value_strings */ @@ -116,7 +120,7 @@ WS_DLL_PUBLIC void range_foreach(range_t *range, void (*callback)(guint32 val)); /** * This function converts a range_t to a (wmem_alloc()-allocated) string. */ -WS_DLL_PUBLIC char *range_convert_range(wmem_allocator_t *scope, range_t *range); +WS_DLL_PUBLIC char *range_convert_range(wmem_allocator_t *scope, const range_t *range); /** * Create a copy of a range. @@ -125,4 +129,8 @@ WS_DLL_PUBLIC char *range_convert_range(wmem_allocator_t *scope, range_t *range) */ WS_DLL_PUBLIC range_t *range_copy(range_t *src); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* __RANGE_H__ */ diff --git a/epan/tfs.h b/epan/tfs.h index 7ba9dea0ca..d7487f9545 100644 --- a/epan/tfs.h +++ b/epan/tfs.h @@ -26,6 +26,10 @@ #include "ws_symbol_export.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + /** @file * true_false strings */ @@ -97,4 +101,8 @@ WS_DLL_PUBLIC const true_false_string tfs_protocol_sensative_bit_transparent; WS_DLL_PUBLIC const true_false_string tfs_full_half; WS_DLL_PUBLIC const true_false_string tfs_acknowledged_not_acknowledged; -#endif +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __TFS_H__ */ |