diff options
28 files changed, 73 insertions, 74 deletions
diff --git a/epan/dissectors/asn1/cmip/cmip.cnf b/epan/dissectors/asn1/cmip/cmip.cnf index 3f37b9d48e..ba8681336f 100644 --- a/epan/dissectors/asn1/cmip/cmip.cnf +++ b/epan/dissectors/asn1/cmip/cmip.cnf @@ -237,9 +237,9 @@ RejectProblem #.FN_BODY Code/local VAL_PTR = &opcode %(DEFAULT_BODY)s if(opcode_type== OPCODE_RETURN_ERROR){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s", val_to_str(opcode, cmip_error_code_vals, " Unknown Opcode:%%d")); + col_append_str(actx->pinfo->cinfo, COL_INFO, val_to_str(opcode, cmip_error_code_vals, " Unknown Opcode:%%d")); }else{ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s", val_to_str(opcode, cmip_Opcode_vals, " Unknown Opcode:%%d")); + col_append_str(actx->pinfo->cinfo, COL_INFO, val_to_str(opcode, cmip_Opcode_vals, " Unknown Opcode:%%d")); } #.END diff --git a/epan/dissectors/asn1/h245/h245.cnf b/epan/dissectors/asn1/h245/h245.cnf index 714158055e..2fd5aef742 100644 --- a/epan/dissectors/asn1/h245/h245.cnf +++ b/epan/dissectors/asn1/h245/h245.cnf @@ -599,7 +599,7 @@ if (h245_pi != NULL) } if (hf_index == hf_h245_subMessageIdentifier_standard) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s", val_to_str(subMessageIdentifier, h245_h239subMessageIdentifier_vals, "<unknown>") ); + col_append_str(actx->pinfo->cinfo, COL_INFO, val_to_str(subMessageIdentifier, h245_h239subMessageIdentifier_vals, "<unknown>") ); g_snprintf(h245_pi->frame_label, 50, "%%s", val_to_str(subMessageIdentifier, h245_h239subMessageIdentifier_vals, "<unknown>")); } #.END diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c index a7cfdd65ea..a1a633c9b6 100644 --- a/epan/dissectors/packet-artnet.c +++ b/epan/dissectors/packet-artnet.c @@ -3189,7 +3189,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ proto_tree_add_item_ret_string(artnet_header_tree, hf_artnet_header_id, tvb, offset, 8, ENC_ASCII|ENC_NA, wmem_packet_scope(), &header); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", header); + col_append_str(pinfo->cinfo, COL_INFO, header); offset += 8; opcode = tvb_get_letohs(tvb, offset); diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index 49049286ad..7211f6b88b 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -4073,7 +4073,7 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat proto_tree_add_item(bthci_cmd_tree, hf_bthci_cmd_parameter, tvb, offset, tvb_captured_length_remaining(tvb, offset), ENC_NA); } else { - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_ext(opcode, &bthci_cmd_opcode_vals_ext, "Unknown 0x%04x")); + col_append_str(pinfo->cinfo, COL_INFO, val_to_str_ext(opcode, &bthci_cmd_opcode_vals_ext, "Unknown 0x%04x")); if (param_length > 0) { switch (ogf) { diff --git a/epan/dissectors/packet-bthci_vendor.c b/epan/dissectors/packet-bthci_vendor.c index f521828543..690d19aea0 100644 --- a/epan/dissectors/packet-bthci_vendor.c +++ b/epan/dissectors/packet-bthci_vendor.c @@ -429,7 +429,7 @@ dissect_bthci_vendor_broadcom(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre description = val_to_str_const(ocf, broadcom_opcode_ocf_vals, "unknown"); if (g_strcmp0(description, "unknown") != 0) - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", description); + col_append_str(pinfo->cinfo, COL_INFO, description); else col_append_fstr(pinfo->cinfo, COL_INFO, "Unknown Command 0x%04X (opcode 0x%04X)", ocf, opcode); @@ -1920,7 +1920,7 @@ dissect_bthci_vendor_intel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, description = val_to_str_const(ocf, intel_opcode_ocf_vals, "unknown"); if (g_strcmp0(description, "unknown") != 0) - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", description); + col_append_str(pinfo->cinfo, COL_INFO, description); else col_append_fstr(pinfo->cinfo, COL_INFO, "Unknown Command 0x%04X (opcode 0x%04X)", ocf, opcode); diff --git a/epan/dissectors/packet-bthfp.c b/epan/dissectors/packet-bthfp.c index 285fa47fac..726700d238 100644 --- a/epan/dissectors/packet-bthfp.c +++ b/epan/dissectors/packet-bthfp.c @@ -1623,7 +1623,7 @@ dissect_at_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i_char += 1; } - if (!command_number) col_append_fstr(pinfo->cinfo, COL_INFO, "%s", col_str); + if (!command_number) col_append_str(pinfo->cinfo, COL_INFO, col_str); if (role == ROLE_HS) { if (command_number) { diff --git a/epan/dissectors/packet-bthsp.c b/epan/dissectors/packet-bthsp.c index c3872c4deb..7b91d10ee8 100644 --- a/epan/dissectors/packet-bthsp.c +++ b/epan/dissectors/packet-bthsp.c @@ -323,7 +323,7 @@ dissect_at_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset, 0, "Command %u", command_number); command_tree = proto_item_add_subtree(command_item, ett_bthsp_command); - if (!command_number) col_append_fstr(pinfo->cinfo, COL_INFO, "%s", col_str); + if (!command_number) col_append_str(pinfo->cinfo, COL_INFO, col_str); if (role == ROLE_HS) { if (command_number) { diff --git a/epan/dissectors/packet-btmcap.c b/epan/dissectors/packet-btmcap.c index 232cde609f..82cec2b773 100644 --- a/epan/dissectors/packet-btmcap.c +++ b/epan/dissectors/packet-btmcap.c @@ -133,7 +133,7 @@ dissect_btmcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ op_code = tvb_get_guint8(tvb, offset); offset += 1; - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(op_code, op_code_vals, "Unknown Op Code")); + col_append_str(pinfo->cinfo, COL_INFO, val_to_str(op_code, op_code_vals, "Unknown Op Code")); if (op_code >= 0x11 && op_code <= 0x20) { proto_item_append_text(pitem, " (Clock Sync)"); col_append_str(pinfo->cinfo, COL_INFO, " (Clock Sync)"); @@ -156,10 +156,10 @@ dissect_btmcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ col_append_fstr(pinfo->cinfo, COL_INFO, " - MDL ID: %u", mdl_id); if (mdl_id == 0xFFFF) { proto_item_append_text(pitem, " (Indicates all MDLs)"); - col_append_fstr(pinfo->cinfo, COL_INFO, " (Indicates all MDLs)"); + col_append_str(pinfo->cinfo, COL_INFO, " (Indicates all MDLs)"); } else if (mdl_id >= 0x0001 && mdl_id <= 0xFEFF) { proto_item_append_text(pitem, " (Dynamic Range)"); - col_append_fstr(pinfo->cinfo, COL_INFO, " (Dynamic Range)"); + col_append_str(pinfo->cinfo, COL_INFO, " (Dynamic Range)"); } else if (mdl_id == 0x0000) { proto_item_append_text(pitem, " (Reserved)"); col_append_str(pinfo->cinfo, COL_INFO, " (Reserved)"); diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index a29df44b07..e4e51e4e19 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -4094,7 +4094,7 @@ dissect_sdp_service_search_request(proto_tree *tree, tvbuff_t *tvb, gint offset, wmem_array_append_one(uuid_array, uuid); proto_item_append_text(ti, " %s", wmem_strbuf_get_str(str)); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", wmem_strbuf_get_str(str)); + col_append_str(pinfo->cinfo, COL_INFO, wmem_strbuf_get_str(str)); if (size < 1) break; @@ -4384,7 +4384,7 @@ dissect_sdp_service_search_attribute_request(proto_tree *tree, tvbuff_t *tvb, size = dissect_sdp_type(next_tree, pinfo, tvb, offset, -1, empty_uuid, 0, 0, -1, NULL, &info_buf); proto_item_append_text(pitem,"%s", wmem_strbuf_get_str(info_buf)); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", wmem_strbuf_get_str(info_buf)); + col_append_str(pinfo->cinfo, COL_INFO, wmem_strbuf_get_str(info_buf)); entry_offset = get_type_length(tvb, offset, &entry_size); dissect_uuid(NULL, tvb, entry_offset, entry_size, &a_uuid); @@ -4395,7 +4395,7 @@ dissect_sdp_service_search_attribute_request(proto_tree *tree, tvbuff_t *tvb, bytes_to_go -= size; } - col_append_fstr(pinfo->cinfo, COL_INFO, ": "); + col_append_str(pinfo->cinfo, COL_INFO, ": "); proto_tree_add_item(tree, hf_maximum_attribute_byte_count, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; diff --git a/epan/dissectors/packet-c15ch.c b/epan/dissectors/packet-c15ch.c index 4183f859c9..76f9bce642 100644 --- a/epan/dissectors/packet-c15ch.c +++ b/epan/dissectors/packet-c15ch.c @@ -4121,7 +4121,7 @@ static void add_digits_string_info_col(tvbuff_t *tvb, } } ch_buff[ num_digits ] = '\0'; - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", ch_buff ); + col_append_str(pinfo->cinfo, COL_INFO, ch_buff); } /* static void add_string_field( proto_tree * p_tree, tvbuff_t * tvb, @@ -4270,7 +4270,7 @@ static int dissect_c15ch_ama(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree call_type_val = tvb_get_guint8(tvb, 40); col_append_fstr(pinfo->cinfo, COL_INFO, ", Call Type: %s", - val_to_str_ext(call_type_val, &ama_call_types_ext, "Unknown %d") ); + val_to_str_ext(call_type_val, &ama_call_types_ext, "Unknown %d")); if (tree) { ti = proto_tree_add_item(tree, hf_c15ch_ama, tvb, 0, 41, ENC_NA); @@ -4339,7 +4339,7 @@ static int dissect_c15ch_clli(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre if ( (clli_siz > 1) && (clli_siz <= 25 ) ) { col_clear(pinfo->cinfo, COL_INFO); - col_append_fstr( pinfo->cinfo, COL_INFO, "Type: CLLI, %s", clli_string ); + col_append_fstr(pinfo->cinfo, COL_INFO, "Type: CLLI, %s", clli_string); } if (tree) { @@ -4422,7 +4422,7 @@ static int dissect_c15ch_cp_state_ch(tvbuff_t *tvb, packet_info *pinfo, proto_tr col_add_fstr(pinfo->cinfo, COL_INFO, "Type: CP_STATE_CH, %s --> ", val_to_str_ext(oldpm_value, &c15_cp_state_pm_types_ext, "Unknown") ); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", + col_append_str(pinfo->cinfo, COL_INFO, val_to_str_ext(newpm_value, &c15_cp_state_pm_types_ext, "Unknown") ); if (tree) @@ -4466,7 +4466,7 @@ static int dissect_c15ch_dest_digits(tvbuff_t *tvb, packet_info *pinfo, proto_tr guint32 num_digits; num_digits = tvb_get_ntohl(tvb, 0); - col_append_fstr(pinfo->cinfo, COL_INFO, ", " ); + col_append_str(pinfo->cinfo, COL_INFO, ", "); add_digits_string_info_col( tvb, 4, num_digits, pinfo); if (tree) { @@ -4646,7 +4646,7 @@ static int dissect_c15ch_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre col_clear(pinfo->cinfo, COL_INFO); col_append_fstr(pinfo->cinfo, COL_INFO, ", Msg Type: %s", - val_to_str_ext(msgtype_value, &c15_isup_types_ext, "Unknown") ); + val_to_str_ext(msgtype_value, &c15_isup_types_ext, "Unknown")); if (tree) { @@ -4868,7 +4868,7 @@ static int dissect_c15ch_nitnxlate(tvbuff_t *tvb, packet_info *pinfo, proto_tree frame_val, shelf_val, lsg_val, unit_val); } } - col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", concat_string ); + col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", concat_string); if (tree) { ti = proto_tree_add_item(tree, hf_c15ch_nitnxlate, tvb, 0, 190, ENC_NA); @@ -5139,7 +5139,7 @@ static int dissect_c15ch_orig(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre num_dn_digits = tvb_get_guint8(tvb, 12); - col_append_fstr(pinfo->cinfo, COL_INFO, ", DN: " ); + col_append_str(pinfo->cinfo, COL_INFO, ", DN: "); add_digits_string_info_col( tvb, 13, num_dn_digits, pinfo); if (tree) @@ -5494,7 +5494,7 @@ static int dissect_c15ch_qos(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree gfloat mos = (gfloat)0.0; mos = tvb_get_ntohl(tvb, 72) / (gfloat) (100.0); - col_append_fstr(pinfo->cinfo, COL_INFO, ", MOS: %.2f", mos ); + col_append_fstr(pinfo->cinfo, COL_INFO, ", MOS: %.2f", mos); if (tree) { ti = proto_tree_add_item(tree, hf_c15ch_qos, tvb, 0, 100, ENC_NA); @@ -5579,8 +5579,7 @@ static int dissect_c15ch_route(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr guint32 route_num_val = 0; route_num_val = tvb_get_ntohl(tvb, 0); - col_append_fstr(pinfo->cinfo, COL_INFO, ", Route Number: %d", - route_num_val ); + col_append_fstr(pinfo->cinfo, COL_INFO, ", Route Number: %d", route_num_val); if (tree) { ti = proto_tree_add_item(tree,hf_c15ch_route, tvb, 0, 17, ENC_NA); @@ -5700,7 +5699,7 @@ static int dissect_c15ch_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre local_ssn_val = tvb_get_guint8(tvb, 4); col_append_fstr(pinfo->cinfo, COL_INFO, ", Local SSN: %s", - val_to_str(local_ssn_val, c15ch_tcap_local_ssn_types, "Unknown %d") ); + val_to_str(local_ssn_val, c15ch_tcap_local_ssn_types, "Unknown %d")); if (tree) { ti = proto_tree_add_item(tree, hf_c15ch_tcap, tvb, 0, 20, ENC_NA); @@ -5798,14 +5797,14 @@ static int dissect_c15ch_cp_event(tvbuff_t *tvb, packet_info *pinfo, proto_tree if ( ( pm_value <= MAX_PM_VAL ) && ( pm_value != DIG_CKT_TEST_PM_VALUE ) ) { col_append_fstr(pinfo->cinfo, COL_INFO, ", Sub PM: %s", - val_to_str(subpm_value, subpm_name_tables[ pm_value ], "%d") ); + val_to_str(subpm_value, subpm_name_tables[ pm_value ], "%d")); } else { if ( pm_value == DIG_CKT_TEST_PM_VALUE ) { col_append_fstr(pinfo->cinfo, COL_INFO, ", Trk PM: %s", - val_to_str(trkpm_value, trkpm_dig_ckt_test_types, "%d") ); + val_to_str(trkpm_value, trkpm_dig_ckt_test_types, "%d")); if ( trkpm_value > MAX_DIG_CKT_TEST_TRKPM_VAL ) { col_append_fstr(pinfo->cinfo, COL_INFO, ", Sub PM: %d", subpm_value); @@ -5813,7 +5812,7 @@ static int dissect_c15ch_cp_event(tvbuff_t *tvb, packet_info *pinfo, proto_tree else { col_append_fstr(pinfo->cinfo, COL_INFO, ", Sub PM: %s", - val_to_str(subpm_value, dig_ckt_test_subpm_name_tables[ trkpm_value ], "%d") ); + val_to_str(subpm_value, dig_ckt_test_subpm_name_tables[ trkpm_value ], "%d")); } } else /* (pm_value < MIN_PM_VAL) || (pm_value > MAX_PM_VAL) */ @@ -5823,7 +5822,7 @@ static int dissect_c15ch_cp_event(tvbuff_t *tvb, packet_info *pinfo, proto_tree } col_append_fstr(pinfo->cinfo, COL_INFO, ", Event Type: %s, Parm: %d", - val_to_str_ext(event_value, &c15_event_types_ext, "Unknown %d"), parm_value ); + val_to_str_ext(event_value, &c15_event_types_ext, "Unknown %d"), parm_value); if (tree) diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index cdd4d3e891..6ad6f99d25 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -2522,7 +2522,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo /* Show comment string */ string_ti = proto_tree_add_item_ret_string(dct2000_tree, hf_catapult_dct2000_comment, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII|ENC_NA, wmem_packet_scope(), &string); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", string); + col_append_str(pinfo->cinfo, COL_INFO, string); if (catapult_dct2000_dissect_mac_lte_oob_messages) { /* Look into string for out-of-band MAC events, such as SRReq, SRInd */ @@ -2549,7 +2549,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo /* Show sprint string */ proto_tree_add_item_ret_string(dct2000_tree, hf_catapult_dct2000_sprint, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII|ENC_NA, wmem_packet_scope(), &string); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", string); + col_append_str(pinfo->cinfo, COL_INFO, string); return tvb_captured_length(tvb); } diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index 7dbcb334c9..5a05e3d975 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -3577,9 +3577,9 @@ dissect_cmip_T_local(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U &opcode); if(opcode_type== OPCODE_RETURN_ERROR){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%s", val_to_str(opcode, cmip_error_code_vals, " Unknown Opcode:%d")); + col_append_str(actx->pinfo->cinfo, COL_INFO, val_to_str(opcode, cmip_error_code_vals, " Unknown Opcode:%d")); }else{ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%s", val_to_str(opcode, cmip_Opcode_vals, " Unknown Opcode:%d")); + col_append_str(actx->pinfo->cinfo, COL_INFO, val_to_str(opcode, cmip_Opcode_vals, " Unknown Opcode:%d")); } diff --git a/epan/dissectors/packet-elmi.c b/epan/dissectors/packet-elmi.c index 845892f5f4..bc00777f35 100644 --- a/epan/dissectors/packet-elmi.c +++ b/epan/dissectors/packet-elmi.c @@ -368,7 +368,7 @@ dissect_elmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ msg_type = tvb_get_guint8(tvb, offset); proto_tree_add_item(elmi_tree, hf_elmi_msg_type, tvb, offset, 1, ENC_BIG_ENDIAN); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", + col_append_str(pinfo->cinfo, COL_INFO, val_to_str(msg_type, elmi_msg_type, "unknown (0x%x)")); offset++; diff --git a/epan/dissectors/packet-gmr1_rach.c b/epan/dissectors/packet-gmr1_rach.c index e778ddfafe..17e17d3f64 100644 --- a/epan/dissectors/packet-gmr1_rach.c +++ b/epan/dissectors/packet-gmr1_rach.c @@ -228,7 +228,7 @@ dissect_gmr1_rach_kls1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree proto_tree_add_item(tree, hf_rach_est_cause, tvb, offset, 1, ENC_BIG_ENDIAN); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", + col_append_str(pinfo->cinfo, COL_INFO, val_to_str(ec, rach_est_cause_vals, "Unknown (%u)")); } @@ -834,7 +834,7 @@ dissect_gmprs_rach_type2_kls2(tvbuff_t *tvb, int offset, proto_tree_add_item(tree, hf_rach_gmprs_req_type, tvb, offset + 8, 1, ENC_BIG_ENDIAN); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", + col_append_str(pinfo->cinfo, COL_INFO, val_to_str(req_type, rach_gmprs_req_type_vals, "Unknown (%u)")); } diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c index 15b00a118d..85e7294317 100644 --- a/epan/dissectors/packet-gvcp.c +++ b/epan/dissectors/packet-gvcp.c @@ -1419,7 +1419,7 @@ static void dissect_readreg_cmd(proto_tree *gvcp_telegram_tree, tvbuff_t *tvb, p } else { - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", address_string); + col_append_str(pinfo->cinfo, COL_INFO, address_string); } if (!pinfo->fd->flags.visited) @@ -1951,7 +1951,7 @@ static void dissect_readreg_ack(proto_tree *gvcp_telegram_tree, tvbuff_t *tvb, p } else { - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", address_string); + col_append_str(pinfo->cinfo, COL_INFO, address_string); } } } @@ -2053,7 +2053,7 @@ static void dissect_readmem_ack(proto_tree *gvcp_telegram_tree, tvbuff_t *tvb, p address_string = get_register_name_from_address(addr, &is_custom_register); /* Fill in Wireshark GUI Info column */ - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", address_string); + col_append_str(pinfo->cinfo, COL_INFO, address_string); if (gvcp_telegram_tree != NULL) { @@ -2090,7 +2090,7 @@ static void dissect_writemem_ack(proto_tree *gvcp_telegram_tree, tvbuff_t *tvb, { const gchar *address_string = NULL; address_string = get_register_name_from_address((*((guint32*)wmem_array_index(gvcp_trans->addr_list, 0))), NULL); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", address_string); + col_append_str(pinfo->cinfo, COL_INFO, address_string); } } diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index 52c760baab..61c6052dc6 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -6670,7 +6670,7 @@ dissect_h245_T_subMessageIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ } if (hf_index == hf_h245_subMessageIdentifier_standard) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%s", val_to_str(subMessageIdentifier, h245_h239subMessageIdentifier_vals, "<unknown>") ); + col_append_str(actx->pinfo->cinfo, COL_INFO, val_to_str(subMessageIdentifier, h245_h239subMessageIdentifier_vals, "<unknown>") ); g_snprintf(h245_pi->frame_label, 50, "%s", val_to_str(subMessageIdentifier, h245_h239subMessageIdentifier_vals, "<unknown>")); } diff --git a/epan/dissectors/packet-hci_h4.c b/epan/dissectors/packet-hci_h4.c index 6def54ea44..54d68d6e15 100644 --- a/epan/dissectors/packet-hci_h4.c +++ b/epan/dissectors/packet-hci_h4.c @@ -101,7 +101,7 @@ dissect_hci_h4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) proto_tree_add_item(main_tree, hf_hci_h4_type, tvb, 0, 1, ENC_LITTLE_ENDIAN); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", + col_append_str(pinfo->cinfo, COL_INFO, val_to_str(type, hci_h4_type_vals, "Unknown HCI packet type 0x%02x")); next_tvb = tvb_new_subset_remaining(tvb, 1); diff --git a/epan/dissectors/packet-hdcp2.c b/epan/dissectors/packet-hdcp2.c index ab70690ccb..149fafbf7d 100644 --- a/epan/dissectors/packet-hdcp2.c +++ b/epan/dissectors/packet-hdcp2.c @@ -153,7 +153,7 @@ dissect_hdcp2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U hdcp_tree = proto_item_add_subtree(pi, ett_hdcp2); cursor = ptvcursor_new(hdcp_tree, tvb, 0); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", + col_append_str(pinfo->cinfo, COL_INFO, val_to_str(msg_id, hdcp2_msg_id, "unknown (0x%x)")); ptvcursor_add(cursor, hf_hdcp2_msg_id, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-hl7.c b/epan/dissectors/packet-hl7.c index c456930ed3..72bfa08987 100644 --- a/epan/dissectors/packet-hl7.c +++ b/epan/dissectors/packet-hl7.c @@ -902,7 +902,7 @@ dissect_hl7_message(tvbuff_t *tvb, guint tvb_offset, gint len, } } else { if (offset == 0) { - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", + col_append_str(pinfo->cinfo, COL_INFO, msh.message_type); } else { col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", diff --git a/epan/dissectors/packet-idrp.c b/epan/dissectors/packet-idrp.c index 65a599b031..d5f614c334 100644 --- a/epan/dissectors/packet-idrp.c +++ b/epan/dissectors/packet-idrp.c @@ -1223,7 +1223,7 @@ dissect_idrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ break; } - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", + col_append_str(pinfo->cinfo, COL_INFO, val_to_str(pdu_type, idrp_pdu_types, "Unknown (%u)")); return offset; diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index 65b410a38c..21d43d7eea 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -1217,7 +1217,7 @@ dissect_opensafety_ssdo_message(tvbuff_t *message_tvb, packet_info *pinfo, proto col_append_fstr(pinfo->cinfo, COL_INFO, " - %s", val_to_str_ext_const(((guint32) (ssdoIndex << 16) + ssdoSubIndex), &opensafety_sod_idx_names_ext, "Unknown")); } - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", "]" ); + col_append_str(pinfo->cinfo, COL_INFO, "]"); payloadOffset += 3; } @@ -1483,7 +1483,7 @@ dissect_opensafety_snmt_message(tvbuff_t *message_tvb, packet_info *pinfo, proto { proto_tree_add_uint_format_value(snmt_tree, hf_oss_snmt_service_id, message_tvb, OSS_FRAME_POS_DATA + packet->frame.subframe1, 1, packet->payload.snmt->ext_msg_id, "Additional parameter missing [Response via SN Acknowledge] (0x%02X)", packet->payload.snmt->ext_msg_id); - col_append_fstr(pinfo->cinfo, COL_INFO, ", Additional parameter missing"); + col_append_str(pinfo->cinfo, COL_INFO, ", Additional parameter missing"); } errcode = tvb_get_guint8(message_tvb, OSS_FRAME_POS_DATA + packet->frame.subframe1 + 2); diff --git a/epan/dissectors/packet-pcep.c b/epan/dissectors/packet-pcep.c index d4913368f7..a88a34c13b 100644 --- a/epan/dissectors/packet-pcep.c +++ b/epan/dissectors/packet-pcep.c @@ -3904,7 +3904,7 @@ dissect_pcep_msg_tree(tvbuff_t *tvb, proto_tree *tree, guint tree_mode, packet_i message_type = tvb_get_guint8(tvb, 1); msg_length = tvb_get_ntohs(tvb, 2); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(message_type, message_type_vals, "Unknown Message (%u). ")); + col_append_str(pinfo->cinfo, COL_INFO, val_to_str(message_type, message_type_vals, "Unknown Message (%u). ")); ti = proto_tree_add_item(tree, proto_pcep, tvb, offset, msg_length, ENC_NA); pcep_tree = proto_item_add_subtree(ti, tree_mode); diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c index 740e94cc02..ffab398176 100644 --- a/epan/dissectors/packet-rpcap.c +++ b/epan/dissectors/packet-rpcap.c @@ -927,7 +927,7 @@ dissect_rpcap (tvbuff_t *tvb, packet_info *pinfo, proto_tree *top_tree, void* da proto_tree_add_item (tree, hf_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - col_append_fstr (pinfo->cinfo, COL_INFO, "%s", + col_append_str (pinfo->cinfo, COL_INFO, val_to_str (msg_type, message_type, "Unknown: %d")); proto_item_append_text (ti, ", %s", val_to_str (msg_type, message_type, "Unknown: %d")); diff --git a/epan/dissectors/packet-s7comm.c b/epan/dissectors/packet-s7comm.c index 703d70d8df..e4a7f7c253 100644 --- a/epan/dissectors/packet-s7comm.c +++ b/epan/dissectors/packet-s7comm.c @@ -2875,7 +2875,7 @@ s7comm_decode_pi_service(tvbuff_t *tvb, num_valid = ws_strtoi32(str, NULL, &num); proto_item_append_text(file_tree, " [%s ", val_to_str(blocktype, blocktype_names, "Unknown Block type: 0x%04x")); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", + col_append_str(pinfo->cinfo, COL_INFO, val_to_str(blocktype, blocktype_names, "Unknown Block type: 0x%04x")); if (num_valid) { proto_item_append_text(file_tree, "%d]", num); @@ -2883,16 +2883,16 @@ s7comm_decode_pi_service(tvbuff_t *tvb, } else { expert_add_info(pinfo, file_tree, &ei_s7comm_data_blockcontrol_block_num_invalid); proto_item_append_text(file_tree, "NaN]"); - col_append_fstr(pinfo->cinfo, COL_INFO, "NaN"); + col_append_str(pinfo->cinfo, COL_INFO, "NaN"); } if (i+1 < count) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", "); + col_append_str(pinfo->cinfo, COL_INFO, ", "); } itemadd = proto_tree_add_item(file_tree, hf_s7comm_data_blockcontrol_dest_filesys, tvb, paramoffset, 1, ENC_ASCII|ENC_NA); proto_item_append_text(itemadd, " (%s)", val_to_str(tvb_get_guint8(tvb, paramoffset), blocktype_attribute2_names, "Unknown filesys: %c")); paramoffset += 1; } - col_append_fstr(pinfo->cinfo, COL_INFO, ")"); + col_append_str(pinfo->cinfo, COL_INFO, ")"); break; case S7COMM_PIP_PROGRAM: case S7COMM_PI_MODU: @@ -3244,7 +3244,7 @@ s7comm_decode_plc_controls_filename(tvbuff_t *tvb, } else { expert_add_info(pinfo, file_tree, &ei_s7comm_data_blockcontrol_block_num_invalid); proto_item_append_text(file_tree, "NaN]"); - col_append_fstr(pinfo->cinfo, COL_INFO, "NaN]"); + col_append_str(pinfo->cinfo, COL_INFO, "NaN]"); } itemadd = proto_tree_add_item(file_tree, hf_s7comm_data_blockcontrol_dest_filesys, tvb, offset, 1, ENC_ASCII|ENC_NA); proto_item_append_text(itemadd, " (%s)", val_to_str(tvb_get_guint8(tvb, offset), blocktype_attribute2_names, "Unknown filesys: %c")); @@ -3931,7 +3931,7 @@ s7comm_decode_ud_cpu_alarm_main(tvbuff_t *tvb, offset += 1; /* show SIG with True values for a quick overview in info-column */ if (signalstate > 0) { - col_append_fstr(pinfo->cinfo, COL_INFO, " On=["); + col_append_str(pinfo->cinfo, COL_INFO, " On=["); for (sig_nr = 0; sig_nr < 8; sig_nr++) { if (signalstate & 0x01) { signalstate >>= 1; @@ -3944,7 +3944,7 @@ s7comm_decode_ud_cpu_alarm_main(tvbuff_t *tvb, signalstate >>= 1; } } - col_append_fstr(pinfo->cinfo, COL_INFO, "]"); + col_append_str(pinfo->cinfo, COL_INFO, "]"); } proto_tree_add_bitmask(msg_obj_item_tree, tvb, offset, hf_s7comm_cpu_alarm_message_state, ett_s7comm_cpu_alarm_message_signal, s7comm_cpu_alarm_message_signal_fields, ENC_BIG_ENDIAN); @@ -4067,13 +4067,13 @@ s7comm_decode_ud_cpu_alarm_query_response(tvbuff_t *tvb, proto_tree_add_item(msg_item_tree, hf_s7comm_cpu_alarm_message_nr_objects, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (n_blocks == 0) { - col_append_fstr(pinfo->cinfo, COL_INFO, " [Last]"); + col_append_str(pinfo->cinfo, COL_INFO, " [Last]"); proto_item_set_len(msg_item_tree, offset - start_offset); return offset; } } if (func > 0) { - col_append_fstr(pinfo->cinfo, COL_INFO, " [Continuation]"); + col_append_str(pinfo->cinfo, COL_INFO, " [Continuation]"); complete_length = func; remaining_length = (gint32)complete_length; returncode = S7COMM_ITEM_RETVAL_DATA_OK; @@ -4400,7 +4400,7 @@ s7comm_decode_ud_block_subfunc(tvbuff_t *tvb, } else { expert_add_info(pinfo, data_tree, &ei_s7comm_ud_blockinfo_block_num_ascii_invalid); proto_item_append_text(data_tree, "NaN]"); - col_append_fstr(pinfo->cinfo, COL_INFO, "NaN]"); + col_append_str(pinfo->cinfo, COL_INFO, "NaN]"); } offset += 5; itemadd = proto_tree_add_item(data_tree, hf_s7comm_ud_blockinfo_filesys, tvb, offset, 1, ENC_ASCII|ENC_NA); diff --git a/epan/dissectors/packet-u3v.c b/epan/dissectors/packet-u3v.c index 149561178e..9c7a1baa51 100644 --- a/epan/dissectors/packet-u3v.c +++ b/epan/dissectors/packet-u3v.c @@ -1409,7 +1409,7 @@ dissect_u3v_read_mem_ack(proto_tree *u3v_telegram_tree, tvbuff_t *tvb, packet_in if (have_address) { address_string = get_register_name_from_address(addr, &is_custom_register, u3v_conv_info); /* Fill in Wireshark GUI Info column */ - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", address_string); + col_append_str(pinfo->cinfo, COL_INFO, address_string); } @@ -1448,7 +1448,7 @@ dissect_u3v_write_mem_ack(proto_tree *u3v_telegram_tree, tvbuff_t *tvb, packet_i address_string = get_register_name_from_address(addr, &is_custom_register, u3v_conv_info); /* Fill in Wireshark GUI Info column */ - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", address_string); + col_append_str(pinfo->cinfo, COL_INFO, address_string); } item = proto_tree_add_item(u3v_telegram_tree, hf_u3v_scd_writemem_ack, tvb, startoffset, length, ENC_NA); @@ -1652,7 +1652,7 @@ dissect_u3v_stream_payload(proto_tree *u3v_telegram_tree, tvbuff_t *tvb, packet_ proto_tree_add_item(u3v_telegram_tree, hf_u3v_stream_data, tvb, 0, -1, ENC_NA); /* Add payload type to information string */ - col_append_fstr(pinfo->cinfo, COL_INFO, "Stream Payload"); + col_append_str(pinfo->cinfo, COL_INFO, "Stream Payload"); } /* diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c index 046f43b1e4..608f1a913c 100644 --- a/epan/dissectors/packet-usb-hid.c +++ b/epan/dissectors/packet-usb-hid.c @@ -1107,7 +1107,7 @@ dissect_usb_hid_boot_keyboard_input_report(tvbuff_t *tvb, packet_info *pinfo, pr if (keycode) { if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_ext(keycode, &keycode_vals_ext, "Unknown")); + col_append_str(pinfo->cinfo, COL_INFO, val_to_str_ext(keycode, &keycode_vals_ext, "Unknown")); shortcut_helper = TRUE; } @@ -1117,7 +1117,7 @@ dissect_usb_hid_boot_keyboard_input_report(tvbuff_t *tvb, packet_info *pinfo, pr if (keycode) { if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_ext(keycode, &keycode_vals_ext, "Unknown")); + col_append_str(pinfo->cinfo, COL_INFO, val_to_str_ext(keycode, &keycode_vals_ext, "Unknown")); shortcut_helper = TRUE; } @@ -1127,7 +1127,7 @@ dissect_usb_hid_boot_keyboard_input_report(tvbuff_t *tvb, packet_info *pinfo, pr if (keycode) { if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_ext(keycode, &keycode_vals_ext, "Unknown")); + col_append_str(pinfo->cinfo, COL_INFO, val_to_str_ext(keycode, &keycode_vals_ext, "Unknown")); shortcut_helper = TRUE; } @@ -1137,7 +1137,7 @@ dissect_usb_hid_boot_keyboard_input_report(tvbuff_t *tvb, packet_info *pinfo, pr if (keycode) { if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_ext(keycode, &keycode_vals_ext, "Unknown")); + col_append_str(pinfo->cinfo, COL_INFO, val_to_str_ext(keycode, &keycode_vals_ext, "Unknown")); shortcut_helper = TRUE; } @@ -1147,7 +1147,7 @@ dissect_usb_hid_boot_keyboard_input_report(tvbuff_t *tvb, packet_info *pinfo, pr if (keycode) { if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_ext(keycode, &keycode_vals_ext, "Unknown")); + col_append_str(pinfo->cinfo, COL_INFO, val_to_str_ext(keycode, &keycode_vals_ext, "Unknown")); shortcut_helper = TRUE; } @@ -1157,7 +1157,7 @@ dissect_usb_hid_boot_keyboard_input_report(tvbuff_t *tvb, packet_info *pinfo, pr if (keycode) { if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_ext(keycode, &keycode_vals_ext, "Unknown")); + col_append_str(pinfo->cinfo, COL_INFO, val_to_str_ext(keycode, &keycode_vals_ext, "Unknown")); shortcut_helper = TRUE; } @@ -1344,7 +1344,7 @@ dissect_usb_hid_control_std_intf(tvbuff_t *tvb, packet_info *pinfo, if (req != USB_SETUP_GET_DESCRIPTOR) return offset; col_clear(pinfo->cinfo, COL_INFO); - col_append_fstr(pinfo->cinfo, COL_INFO, "GET DESCRIPTOR Request"); + col_append_str(pinfo->cinfo, COL_INFO, "GET DESCRIPTOR Request"); offset += 1; proto_tree_add_item(tree, hf_usb_hid_bDescriptorIndex, tvb, offset, 1, ENC_LITTLE_ENDIAN); @@ -1366,7 +1366,7 @@ dissect_usb_hid_control_std_intf(tvbuff_t *tvb, packet_info *pinfo, } else { col_clear(pinfo->cinfo, COL_INFO); - col_append_fstr(pinfo->cinfo, COL_INFO, "GET DESCRIPTOR Response"); + col_append_str(pinfo->cinfo, COL_INFO, "GET DESCRIPTOR Response"); col_append_fstr(pinfo->cinfo, COL_INFO, " %s", val_to_str_ext(usb_trans_info->u.get_descriptor.type, &hid_descriptor_type_vals_ext, "Unknown type %u")); diff --git a/epan/dissectors/packet-wai.c b/epan/dissectors/packet-wai.c index 98854bd384..1593a7c5e8 100644 --- a/epan/dissectors/packet-wai.c +++ b/epan/dissectors/packet-wai.c @@ -894,7 +894,7 @@ Figure 18 from [ref:1] if (version == 1) { subtype_name = val_to_str_ext_const(subtype, &wai_subtype_names_ext, "Unknown type"); } - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", subtype_name); + col_append_str(pinfo->cinfo, COL_INFO, subtype_name); /* Field lengths and offsets in WAI protocol described above */ packet_num = tvb_get_ntohs(tvb, 8); diff --git a/epan/dissectors/packet-ypserv.c b/epan/dissectors/packet-ypserv.c index a8d8cf3477..32f9808fe0 100644 --- a/epan/dissectors/packet-ypserv.c +++ b/epan/dissectors/packet-ypserv.c @@ -183,7 +183,7 @@ dissect_match_call(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void /*key*/ offset = dissect_rpc_string(tvb, tree, hf_ypserv_key, offset, &str); - col_append_fstr(pinfo->cinfo, COL_INFO,"%s", str); + col_append_str(pinfo->cinfo, COL_INFO, str); proto_item_append_text(tree, "%s", str); return offset; |