diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-09-08 19:32:10 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-09-08 19:32:10 +0000 |
| commit | 1b009df7495d3bd20aa09d7691855d927d96a87d (patch) | |
| tree | ecb30deac855b55596994b9eb32490c9dc91ad90 /epan/expert.h | |
| parent | fb75b6867e2181095ad023e09cafa72ab706a94c (diff) | |
Couldn't quite figure out how to make the expert items in proto.c and the LUA API filterable (suggestions welcome!), but I wanted to start forcing dissectors to use the filterable expert API (nothing like compile errors to force change!). I created expert_add_info_format_internal (original expert_add_info_format) and used it as a placeholder for proto.c/LUA API until a solution is created. The "new" expert_add_info_format will be the "old" expert_add_info_format_text, and I'll slowly do the search/replace.
For those with dissectors outside the source tree, please see tools/convert_expert_add_info_format.pl for help with the conversion. Please do not use expert_add_info_format_internal, as it's support time will be very short lived.
svn path=/trunk/; revision=51844
Diffstat (limited to 'epan/expert.h')
| -rw-r--r-- | epan/expert.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/epan/expert.h b/epan/expert.h index 48e71fce1f..a6351df964 100644 --- a/epan/expert.h +++ b/epan/expert.h @@ -139,7 +139,7 @@ expert_update_comment_count(guint64 count); WS_DLL_PUBLIC void expert_add_info(packet_info *pinfo, proto_item *pi, expert_field* eiindex); -/** Add an expert info. TO BE DEPRECATED IN ITS CURRENT FORM!!! +/** Add an expert info. FOR INTERNAL (NON-DISSECTOR) USE ONLY!!! Add an expert info tree to a protocol item, with classification and message. @param pinfo Packet info of the currently processed packet. May be NULL if pi is supplied @@ -149,12 +149,12 @@ expert_add_info(packet_info *pinfo, proto_item *pi, expert_field* eiindex); @param format Printf-style format string for additional arguments */ WS_DLL_PUBLIC void -expert_add_info_format(packet_info *pinfo, proto_item *pi, int group, +expert_add_info_format_internal(packet_info *pinfo, proto_item *pi, int group, int severity, const char *format, ...) G_GNUC_PRINTF(5, 6); /** Add an expert info. - Add an expert info tree to a protocol item, using registered expert info item, + Add an expert info tree to a protocol item, using registered expert info item, but with a formatted message. @param pinfo Packet info of the currently processed packet. May be NULL if pi is supplied @@ -163,9 +163,12 @@ expert_add_info_format(packet_info *pinfo, proto_item *pi, int group, @param format Printf-style format string for additional arguments */ WS_DLL_PUBLIC void -expert_add_info_format_text(packet_info *pinfo, proto_item *pi, expert_field *eiindex, +expert_add_info_format(packet_info *pinfo, proto_item *pi, expert_field *eiindex, const char *format, ...) G_GNUC_PRINTF(4, 5); +/* XXX - TEMPORARY WHILE SEARCH/REPLACE OF expert_add_info_format_text IS DONE */ +#define expert_add_info_format_text expert_add_info_format + /** Add an expert info associated with some byte data Add an expert info tree to a protocol item using registered expert info item. This function is intended to replace places where |