diff options
author | Michael Mann <mmann78@netscape.net> | 2013-09-09 01:02:44 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2013-09-09 01:02:44 +0000 |
commit | bffe25fdc22c076cca8bb5b48aac4e80d5fbd730 (patch) | |
tree | 98e3953a93001e8fc858bda8261e4ef47c80dc84 /epan | |
parent | 9e3f9b449f5c25ad7266bdef972212e9f29114f7 (diff) | |
download | wireshark-bffe25fdc22c076cca8bb5b48aac4e80d5fbd730.tar.gz |
Complete the conversion of expert_add_info_format_text -> expert_add_info_format.
svn path=/trunk/; revision=51853
Diffstat (limited to 'epan')
-rw-r--r-- | epan/expert.h | 3 | ||||
-rw-r--r-- | epan/show_exception.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/epan/expert.h b/epan/expert.h index a6351df964..2bea45fe30 100644 --- a/epan/expert.h +++ b/epan/expert.h @@ -166,9 +166,6 @@ WS_DLL_PUBLIC void 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 diff --git a/epan/show_exception.c b/epan/show_exception.c index eddcdb755a..cc915035ed 100644 --- a/epan/show_exception.c +++ b/epan/show_exception.c @@ -128,7 +128,7 @@ show_exception(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pinfo->current_proto, pinfo->fd->num, exception_message == NULL ? dissector_error_nomsg : exception_message); - expert_add_info_format_text(pinfo, item, &ei_malformed_dissector_bug, "%s", + expert_add_info_format(pinfo, item, &ei_malformed_dissector_bug, "%s", exception_message == NULL ? dissector_error_nomsg : exception_message); break; @@ -144,7 +144,7 @@ show_exception(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pinfo->current_proto, exception_message == NULL ? dissector_error_nomsg : exception_message); - expert_add_info_format_text(pinfo, item, &ei_malformed_reassembly, "%s", + expert_add_info_format(pinfo, item, &ei_malformed_reassembly, "%s", exception_message == NULL ? dissector_error_nomsg : exception_message); break; |