diff options
author | Michael Mann <mmann78@netscape.net> | 2013-09-09 00:28:48 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2013-09-09 00:28:48 +0000 |
commit | 00dd0adc0d737aba2ba41bd1dd0ce830a94c815e (patch) | |
tree | 9b22ebb02d6d9e1972a081b547f207d7a0831eaa | |
parent | 7ec34a52c5d63484159a2992f1fe254c94327145 (diff) |
expert_add_info_format_text -> expert_add_info_format
svn path=/trunk/; revision=51851
-rw-r--r-- | asn1/c1222/packet-c1222-template.c | 30 | ||||
-rw-r--r-- | asn1/kerberos/packet-kerberos-template.c | 2 | ||||
-rw-r--r-- | asn1/lte-rrc/packet-lte-rrc-template.c | 10 | ||||
-rw-r--r-- | asn1/ros/packet-ros-template.c | 2 | ||||
-rw-r--r-- | asn1/rtse/packet-rtse-template.c | 2 | ||||
-rw-r--r-- | asn1/snmp/packet-snmp-template.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-c1222.c | 30 | ||||
-rw-r--r-- | epan/dissectors/packet-lte-rrc.c | 10 | ||||
-rw-r--r-- | epan/dissectors/packet-ros.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-rtse.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-snmp.c | 4 |
11 files changed, 49 insertions, 49 deletions
diff --git a/asn1/c1222/packet-c1222-template.c b/asn1/c1222/packet-c1222-template.c index a26d3f5069..e2617f89ff 100644 --- a/asn1/c1222/packet-c1222-template.c +++ b/asn1/c1222/packet-c1222-template.c @@ -395,7 +395,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm proto_item_set_text(tree, "C12.22 EPSEM: %s (id %d, user \"%s\")", val_to_str(cmd,commandnames,"Unknown (0x%02x)"), user_id, user_name); } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 LOGON command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 LOGON command truncated"); } break; case C1222_CMD_SECURITY: @@ -416,7 +416,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm val_to_str(cmd,commandnames,"Unknown (0x%02x)"), password); } } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 SECURITY command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 SECURITY command truncated"); } break; case C1222_CMD_AUTHENTICATE: @@ -432,10 +432,10 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm proto_item_set_text(tree, "C12.22 EPSEM: %s (%d bytes: %s)", val_to_str(cmd,commandnames,"Unknown (0x%02x)"), auth_len, auth_req); } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 AUTHENTICATE command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 AUTHENTICATE command truncated"); } } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 AUTHENTICATE command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 AUTHENTICATE command truncated"); } break; case C1222_CMD_FULL_READ: @@ -448,7 +448,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm *offset += 2; *length -= 2; } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 READ command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 READ command truncated"); } break; case C1222_CMD_PARTIAL_READ_OFFSET: @@ -467,7 +467,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm val_to_str(cmd,commandnames,"Unknown (0x%02x)"), val_to_str((table >> 8) & 0xF8, tableflags,"Unknown (0x%04x)"), table & 0x7FF); } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 READ command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 READ command truncated"); } break; case C1222_CMD_FULL_WRITE: @@ -499,7 +499,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm calcsum = c1222_cksum(tvb, (*offset)-tblsize, tblsize); } if (chksum != calcsum) { - expert_add_info_format_text(pinfo, item, &ei_c1222_bad_checksum, "Bad checksum [should be 0x%02x]", calcsum); + expert_add_info_format(pinfo, item, &ei_c1222_bad_checksum, "Bad checksum [should be 0x%02x]", calcsum); } if (table == 7) {/* is it a procedure call? */ proto_item_set_text(tree, "C12.22 EPSEM: %s (%s-%d, %s-%d)", @@ -514,10 +514,10 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm *offset += 1; *length -= 1; } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 WRITE command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 WRITE command truncated"); } } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 WRITE command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 WRITE command truncated"); } break; case C1222_CMD_PARTIAL_WRITE_OFFSET: @@ -541,7 +541,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm item = proto_tree_add_uint(tree, hf_c1222_write_chksum, tvb, *offset, 1, chksum); calcsum = c1222_cksum(tvb, (*offset)-tblsize, tblsize); if (chksum != calcsum) { - expert_add_info_format_text(pinfo, item, &ei_c1222_bad_checksum, "Bad checksum [should be 0x%02x]", calcsum); + expert_add_info_format(pinfo, item, &ei_c1222_bad_checksum, "Bad checksum [should be 0x%02x]", calcsum); } proto_item_set_text(tree, "C12.22 EPSEM: %s (%s-%d)", val_to_str(cmd,commandnames,"Unknown (0x%02x)"), @@ -549,10 +549,10 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm *offset += 1; *length -= 1; } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 WRITE command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 WRITE command truncated"); } } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 WRITE command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 WRITE command truncated"); } break; case C1222_CMD_WAIT: @@ -564,7 +564,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm proto_item_set_text(tree, "C12.22 EPSEM: %s (%d seconds)", val_to_str(cmd,commandnames,"Unknown (0x%02x)"), wait_seconds); } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 WAIT command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 WAIT command truncated"); } break; case C1222_CMD_NEGOTIATE: @@ -580,7 +580,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm proto_item_set_text(tree, "C12.22 EPSEM: %s (pkt size %d, num pkts %d, with %d baud rates)", val_to_str(cmd,commandnames,"Unknown (0x%02x)"), packet_size, nbr_packet, numrates); } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 NEGOTIATE command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 NEGOTIATE command truncated"); } break; case C1222_CMD_TIMING_SETUP: @@ -604,7 +604,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm proto_item_set_text(tree, "C12.22 EPSEM: %s (traffic to %d s, inter-char to %d s, response to %d s, %d retries)", val_to_str(cmd,commandnames,"Unknown (0x%02x)"), traffic, inter_char, resp_to, nbr_retries); } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 NEGOTIATE command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 NEGOTIATE command truncated"); } break; diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c index cd47ab9b15..5a9d07d3ea 100644 --- a/asn1/kerberos/packet-kerberos-template.c +++ b/asn1/kerberos/packet-kerberos-template.c @@ -388,7 +388,7 @@ decrypt_krb5_data(proto_tree *tree, packet_info *pinfo, if(ret == 0){ char *user_data; - expert_add_info_format_text(pinfo, NULL, &ei_kerberos_decrypted_keytype, + expert_add_info_format(pinfo, NULL, &ei_kerberos_decrypted_keytype, "Decrypted keytype %d in frame %u using %s", ek->keytype, pinfo->fd->num, ek->key_origin); diff --git a/asn1/lte-rrc/packet-lte-rrc-template.c b/asn1/lte-rrc/packet-lte-rrc-template.c index 38110e9ed7..127cc35a6d 100644 --- a/asn1/lte-rrc/packet-lte-rrc-template.c +++ b/asn1/lte-rrc/packet-lte-rrc-template.c @@ -1929,7 +1929,7 @@ dissect_lte_rrc_warningMessageSegment(tvbuff_t *warning_msg_seg_tvb, proto_tree nb_of_pages = tvb_get_guint8(warning_msg_seg_tvb, 0); ti = proto_tree_add_uint(tree, hf_lte_rrc_warningMessageSegment_nb_pages, warning_msg_seg_tvb, 0, 1, nb_of_pages); if (nb_of_pages > 15) { - expert_add_info_format_text(pinfo, ti, &ei_lte_rrc_number_pages_le15, + expert_add_info_format(pinfo, ti, &ei_lte_rrc_number_pages_le15, "Number of pages should be <=15 (found %u)", nb_of_pages); nb_of_pages = 15; } @@ -2141,7 +2141,7 @@ static void drx_check_config_sane(drx_config_t *config, asn1_ctx_t *actx) { /* OnDuration must be shorter than long cycle */ if (config->onDurationTimer >= config->longCycle) { - expert_add_info_format_text(actx->pinfo, actx->created_item, &ei_lte_rrc_invalid_drx_config, + expert_add_info_format(actx->pinfo, actx->created_item, &ei_lte_rrc_invalid_drx_config, "OnDurationTimer (%u) should be less than long cycle (%u)", config->onDurationTimer, config->longCycle); } @@ -2149,20 +2149,20 @@ static void drx_check_config_sane(drx_config_t *config, asn1_ctx_t *actx) if (config->shortCycleConfigured) { /* Short cycle must be < long, and be a multiple of it */ if (config->shortCycle >= config->longCycle) { - expert_add_info_format_text(actx->pinfo, actx->created_item, &ei_lte_rrc_invalid_drx_config, + expert_add_info_format(actx->pinfo, actx->created_item, &ei_lte_rrc_invalid_drx_config, "Short DRX cycle (%u) must be shorter than long cycle (%u)", config->shortCycle, config->longCycle); } /* Long cycle needs to be an exact multiple of the short cycle */ else if (config->shortCycle && ((config->longCycle % config->shortCycle) != 0)) { - expert_add_info_format_text(actx->pinfo, actx->created_item, &ei_lte_rrc_invalid_drx_config, + expert_add_info_format(actx->pinfo, actx->created_item, &ei_lte_rrc_invalid_drx_config, "Short DRX cycle (%u) must divide the long cycle (%u) exactly", config->shortCycle, config->longCycle); } /* OnDuration shouldn't be longer than the short cycle */ if (config->onDurationTimer >= config->shortCycle) { - expert_add_info_format_text(actx->pinfo, actx->created_item, &ei_lte_rrc_invalid_drx_config, + expert_add_info_format(actx->pinfo, actx->created_item, &ei_lte_rrc_invalid_drx_config, "OnDurationTimer (%u) should not be longer than the short cycle (%u)", config->onDurationTimer, config->shortCycle); } diff --git a/asn1/ros/packet-ros-template.c b/asn1/ros/packet-ros-template.c index 1c411eea3b..f2287d820c 100644 --- a/asn1/ros/packet-ros-template.c +++ b/asn1/ros/packet-ros-template.c @@ -218,7 +218,7 @@ call_ros_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *p proto_item *item=proto_tree_add_text(tree, next_tvb, 0, tvb_length_remaining(tvb, offset), "ROS: Dissector for OID:%s not implemented. Contact Wireshark developers if you want this supported", oid); proto_tree *next_tree=proto_item_add_subtree(item, ett_ros_unknown); - expert_add_info_format_text(pinfo, item, &ei_ros_dissector_oid_not_implemented, + expert_add_info_format(pinfo, item, &ei_ros_dissector_oid_not_implemented, "ROS: Dissector for OID %s not implemented", oid); dissect_unknown_ber(pinfo, next_tvb, offset, next_tree); } diff --git a/asn1/rtse/packet-rtse-template.c b/asn1/rtse/packet-rtse-template.c index d3fb26f02a..c7f053453a 100644 --- a/asn1/rtse/packet-rtse-template.c +++ b/asn1/rtse/packet-rtse-template.c @@ -151,7 +151,7 @@ call_rtse_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info * proto_item *item=proto_tree_add_text(tree, next_tvb, 0, tvb_length_remaining(tvb, offset), "RTSE: Dissector for OID:%s not implemented. Contact Wireshark developers if you want this supported", oid); proto_tree *next_tree=proto_item_add_subtree(item, ett_rtse_unknown); - expert_add_info_format_text(pinfo, item, &ei_rtse_dissector_oid_not_implemented, + expert_add_info_format(pinfo, item, &ei_rtse_dissector_oid_not_implemented, "RTSE: Dissector for OID %s not implemented", oid); dissect_unknown_ber(pinfo, next_tvb, offset, next_tree); } diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c index ba96d57c6a..bebd866aee 100644 --- a/asn1/snmp/packet-snmp-template.c +++ b/asn1/snmp/packet-snmp-template.c @@ -618,7 +618,7 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, repr = oid_encoded2string(oid_bytes, name_len); pi = proto_tree_add_text(pt_name,tvb, 0, 0, "invalid oid: %s", repr); pt = proto_item_add_subtree(pi, ett_decoding_error); - expert_add_info_format_text(actx->pinfo, pi, &ei_snmp_invalid_oid, "invalid oid: %s", repr); + expert_add_info_format(actx->pinfo, pi, &ei_snmp_invalid_oid, "invalid oid: %s", repr); return dissect_unknown_ber(actx->pinfo, tvb, name_offset, pt); } @@ -658,7 +658,7 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, } pi = proto_tree_add_item(pt_varbind,hfid,tvb,value_offset,value_len,ENC_BIG_ENDIAN); - expert_add_info_format_text(actx->pinfo, pi, &ei_snmp_varbind_response, "%s",note); + expert_add_info_format(actx->pinfo, pi, &ei_snmp_varbind_response, "%s",note); g_strlcpy (label, note, ITEM_LABEL_LENGTH); goto set_label; } diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c index 1ec6d70555..e707d97342 100644 --- a/epan/dissectors/packet-c1222.c +++ b/epan/dissectors/packet-c1222.c @@ -443,7 +443,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm proto_item_set_text(tree, "C12.22 EPSEM: %s (id %d, user \"%s\")", val_to_str(cmd,commandnames,"Unknown (0x%02x)"), user_id, user_name); } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 LOGON command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 LOGON command truncated"); } break; case C1222_CMD_SECURITY: @@ -464,7 +464,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm val_to_str(cmd,commandnames,"Unknown (0x%02x)"), password); } } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 SECURITY command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 SECURITY command truncated"); } break; case C1222_CMD_AUTHENTICATE: @@ -480,10 +480,10 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm proto_item_set_text(tree, "C12.22 EPSEM: %s (%d bytes: %s)", val_to_str(cmd,commandnames,"Unknown (0x%02x)"), auth_len, auth_req); } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 AUTHENTICATE command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 AUTHENTICATE command truncated"); } } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 AUTHENTICATE command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 AUTHENTICATE command truncated"); } break; case C1222_CMD_FULL_READ: @@ -496,7 +496,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm *offset += 2; *length -= 2; } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 READ command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 READ command truncated"); } break; case C1222_CMD_PARTIAL_READ_OFFSET: @@ -515,7 +515,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm val_to_str(cmd,commandnames,"Unknown (0x%02x)"), val_to_str((table >> 8) & 0xF8, tableflags,"Unknown (0x%04x)"), table & 0x7FF); } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 READ command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 READ command truncated"); } break; case C1222_CMD_FULL_WRITE: @@ -547,7 +547,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm calcsum = c1222_cksum(tvb, (*offset)-tblsize, tblsize); } if (chksum != calcsum) { - expert_add_info_format_text(pinfo, item, &ei_c1222_bad_checksum, "Bad checksum [should be 0x%02x]", calcsum); + expert_add_info_format(pinfo, item, &ei_c1222_bad_checksum, "Bad checksum [should be 0x%02x]", calcsum); } if (table == 7) {/* is it a procedure call? */ proto_item_set_text(tree, "C12.22 EPSEM: %s (%s-%d, %s-%d)", @@ -562,10 +562,10 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm *offset += 1; *length -= 1; } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 WRITE command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 WRITE command truncated"); } } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 WRITE command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 WRITE command truncated"); } break; case C1222_CMD_PARTIAL_WRITE_OFFSET: @@ -589,7 +589,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm item = proto_tree_add_uint(tree, hf_c1222_write_chksum, tvb, *offset, 1, chksum); calcsum = c1222_cksum(tvb, (*offset)-tblsize, tblsize); if (chksum != calcsum) { - expert_add_info_format_text(pinfo, item, &ei_c1222_bad_checksum, "Bad checksum [should be 0x%02x]", calcsum); + expert_add_info_format(pinfo, item, &ei_c1222_bad_checksum, "Bad checksum [should be 0x%02x]", calcsum); } proto_item_set_text(tree, "C12.22 EPSEM: %s (%s-%d)", val_to_str(cmd,commandnames,"Unknown (0x%02x)"), @@ -597,10 +597,10 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm *offset += 1; *length -= 1; } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 WRITE command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 WRITE command truncated"); } } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 WRITE command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 WRITE command truncated"); } break; case C1222_CMD_WAIT: @@ -612,7 +612,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm proto_item_set_text(tree, "C12.22 EPSEM: %s (%d seconds)", val_to_str(cmd,commandnames,"Unknown (0x%02x)"), wait_seconds); } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 WAIT command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 WAIT command truncated"); } break; case C1222_CMD_NEGOTIATE: @@ -628,7 +628,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm proto_item_set_text(tree, "C12.22 EPSEM: %s (pkt size %d, num pkts %d, with %d baud rates)", val_to_str(cmd,commandnames,"Unknown (0x%02x)"), packet_size, nbr_packet, numrates); } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 NEGOTIATE command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 NEGOTIATE command truncated"); } break; case C1222_CMD_TIMING_SETUP: @@ -652,7 +652,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm proto_item_set_text(tree, "C12.22 EPSEM: %s (traffic to %d s, inter-char to %d s, response to %d s, %d retries)", val_to_str(cmd,commandnames,"Unknown (0x%02x)"), traffic, inter_char, resp_to, nbr_retries); } else { - expert_add_info_format_text(pinfo, tree, &ei_c1222_command_truncated, "C12.22 NEGOTIATE command truncated"); + expert_add_info_format(pinfo, tree, &ei_c1222_command_truncated, "C12.22 NEGOTIATE command truncated"); } break; diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index a8030a3b03..4c3b729af9 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -5256,7 +5256,7 @@ dissect_lte_rrc_warningMessageSegment(tvbuff_t *warning_msg_seg_tvb, proto_tree nb_of_pages = tvb_get_guint8(warning_msg_seg_tvb, 0); ti = proto_tree_add_uint(tree, hf_lte_rrc_warningMessageSegment_nb_pages, warning_msg_seg_tvb, 0, 1, nb_of_pages); if (nb_of_pages > 15) { - expert_add_info_format_text(pinfo, ti, &ei_lte_rrc_number_pages_le15, + expert_add_info_format(pinfo, ti, &ei_lte_rrc_number_pages_le15, "Number of pages should be <=15 (found %u)", nb_of_pages); nb_of_pages = 15; } @@ -5468,7 +5468,7 @@ static void drx_check_config_sane(drx_config_t *config, asn1_ctx_t *actx) { /* OnDuration must be shorter than long cycle */ if (config->onDurationTimer >= config->longCycle) { - expert_add_info_format_text(actx->pinfo, actx->created_item, &ei_lte_rrc_invalid_drx_config, + expert_add_info_format(actx->pinfo, actx->created_item, &ei_lte_rrc_invalid_drx_config, "OnDurationTimer (%u) should be less than long cycle (%u)", config->onDurationTimer, config->longCycle); } @@ -5476,20 +5476,20 @@ static void drx_check_config_sane(drx_config_t *config, asn1_ctx_t *actx) if (config->shortCycleConfigured) { /* Short cycle must be < long, and be a multiple of it */ if (config->shortCycle >= config->longCycle) { - expert_add_info_format_text(actx->pinfo, actx->created_item, &ei_lte_rrc_invalid_drx_config, + expert_add_info_format(actx->pinfo, actx->created_item, &ei_lte_rrc_invalid_drx_config, "Short DRX cycle (%u) must be shorter than long cycle (%u)", config->shortCycle, config->longCycle); } /* Long cycle needs to be an exact multiple of the short cycle */ else if (config->shortCycle && ((config->longCycle % config->shortCycle) != 0)) { - expert_add_info_format_text(actx->pinfo, actx->created_item, &ei_lte_rrc_invalid_drx_config, + expert_add_info_format(actx->pinfo, actx->created_item, &ei_lte_rrc_invalid_drx_config, "Short DRX cycle (%u) must divide the long cycle (%u) exactly", config->shortCycle, config->longCycle); } /* OnDuration shouldn't be longer than the short cycle */ if (config->onDurationTimer >= config->shortCycle) { - expert_add_info_format_text(actx->pinfo, actx->created_item, &ei_lte_rrc_invalid_drx_config, + expert_add_info_format(actx->pinfo, actx->created_item, &ei_lte_rrc_invalid_drx_config, "OnDurationTimer (%u) should not be longer than the short cycle (%u)", config->onDurationTimer, config->shortCycle); } diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c index 757833a621..50353e5007 100644 --- a/epan/dissectors/packet-ros.c +++ b/epan/dissectors/packet-ros.c @@ -272,7 +272,7 @@ call_ros_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *p proto_item *item=proto_tree_add_text(tree, next_tvb, 0, tvb_length_remaining(tvb, offset), "ROS: Dissector for OID:%s not implemented. Contact Wireshark developers if you want this supported", oid); proto_tree *next_tree=proto_item_add_subtree(item, ett_ros_unknown); - expert_add_info_format_text(pinfo, item, &ei_ros_dissector_oid_not_implemented, + expert_add_info_format(pinfo, item, &ei_ros_dissector_oid_not_implemented, "ROS: Dissector for OID %s not implemented", oid); dissect_unknown_ber(pinfo, next_tvb, offset, next_tree); } diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index f1c2b538b7..3642f86b64 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -201,7 +201,7 @@ call_rtse_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info * proto_item *item=proto_tree_add_text(tree, next_tvb, 0, tvb_length_remaining(tvb, offset), "RTSE: Dissector for OID:%s not implemented. Contact Wireshark developers if you want this supported", oid); proto_tree *next_tree=proto_item_add_subtree(item, ett_rtse_unknown); - expert_add_info_format_text(pinfo, item, &ei_rtse_dissector_oid_not_implemented, + expert_add_info_format(pinfo, item, &ei_rtse_dissector_oid_not_implemented, "RTSE: Dissector for OID %s not implemented", oid); dissect_unknown_ber(pinfo, next_tvb, offset, next_tree); } diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index ae7c5c7cea..34f604e3ce 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -720,7 +720,7 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, repr = oid_encoded2string(oid_bytes, name_len); pi = proto_tree_add_text(pt_name,tvb, 0, 0, "invalid oid: %s", repr); pt = proto_item_add_subtree(pi, ett_decoding_error); - expert_add_info_format_text(actx->pinfo, pi, &ei_snmp_invalid_oid, "invalid oid: %s", repr); + expert_add_info_format(actx->pinfo, pi, &ei_snmp_invalid_oid, "invalid oid: %s", repr); return dissect_unknown_ber(actx->pinfo, tvb, name_offset, pt); } @@ -760,7 +760,7 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, } pi = proto_tree_add_item(pt_varbind,hfid,tvb,value_offset,value_len,ENC_BIG_ENDIAN); - expert_add_info_format_text(actx->pinfo, pi, &ei_snmp_varbind_response, "%s",note); + expert_add_info_format(actx->pinfo, pi, &ei_snmp_varbind_response, "%s",note); g_strlcpy (label, note, ITEM_LABEL_LENGTH); goto set_label; } |