From 2bba6be84fe612e272d9b0388c0f51e8c4ef3ba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Thu, 18 Jun 2009 23:22:10 +0000 Subject: From Kovarththanan Rajaratnam via bug 3548: Cleanup header_field_info in plugins. svn path=/trunk/; revision=28771 --- plugins/irda/packet-ircomm.c | 14 ++-- plugins/irda/packet-irda.c | 148 +++++++++++++++++++++---------------------- plugins/irda/packet-sir.c | 16 ++--- 3 files changed, 89 insertions(+), 89 deletions(-) (limited to 'plugins/irda') diff --git a/plugins/irda/packet-ircomm.c b/plugins/irda/packet-ircomm.c index 34490cb625..8f4790f5f8 100644 --- a/plugins/irda/packet-ircomm.c +++ b/plugins/irda/packet-ircomm.c @@ -392,27 +392,27 @@ void proto_register_ircomm(void) { &hf_ircomm_param, { "IrCOMM Parameter", "ircomm.parameter", FT_NONE, BASE_NONE, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_param_pi, { "Parameter Identifier", "ircomm.pi", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_param_pl, { "Parameter Length", "ircomm.pl", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_param_pv, { "Parameter Value", "ircomm.pv", - FT_BYTES, BASE_HEX, NULL, 0, - "", HFILL }}, + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_control, { "Control Channel", "ircomm.control", FT_NONE, BASE_NONE, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_control_len, { "Clen", "ircomm.control.len", FT_UINT8, BASE_DEC, NULL, 0, - "", HFILL }} + NULL, HFILL }} }; /* Setup protocol subtree arrays */ diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c index dc5669ae05..9b16b2219f 100644 --- a/plugins/irda/packet-irda.c +++ b/plugins/irda/packet-irda.c @@ -1954,295 +1954,295 @@ void proto_register_irda(void) { &hf_lap_a, { "Address Field", "irlap.a", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_a_cr, { "C/R", "irlap.a.cr", FT_BOOLEAN, 8, TFS(&lap_cr_vals), CMD_FRAME, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_a_address, { "Address", "irlap.a.address", FT_UINT8, BASE_HEX, NULL, ~CMD_FRAME, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_c, { "Control Field", "irlap.c", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_c_nr, { "N(R)", "irlap.c.n_r", FT_UINT8, BASE_DEC, NULL, XDLC_N_R_MASK, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_c_ns, { "N(S)", "irlap.c.n_s", FT_UINT8, BASE_DEC, NULL, XDLC_N_S_MASK, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_c_p, { "Poll", "irlap.c.p", FT_BOOLEAN, 8, TFS(&set_notset), XDLC_P_F, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_c_f, { "Final", "irlap.c.f", FT_BOOLEAN, 8, TFS(&set_notset), XDLC_P_F, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_c_s, { "Supervisory frame type", "irlap.c.s_ftype", FT_UINT8, BASE_HEX, VALS(lap_c_s_vals), XDLC_S_FTYPE_MASK, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_c_u_cmd, { "Command", "irlap.c.u_modifier_cmd", FT_UINT8, BASE_HEX, VALS(lap_c_u_cmd_vals), XDLC_U_MODIFIER_MASK, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_c_u_rsp, { "Response", "irlap.c.u_modifier_resp", FT_UINT8, BASE_HEX, VALS(lap_c_u_rsp_vals), XDLC_U_MODIFIER_MASK, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_c_i, { "Frame Type", "irlap.c.ftype", FT_UINT8, BASE_HEX, VALS(lap_c_ftype_vals), XDLC_I_MASK, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_c_s_u, { "Frame Type", "irlap.c.ftype", FT_UINT8, BASE_HEX, VALS(lap_c_ftype_vals), XDLC_S_U_MASK, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_i, { "Information Field", "irlap.i", FT_NONE, BASE_NONE, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_snrm_saddr, { "Source Device Address", "irlap.snrm.saddr", FT_UINT32, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_snrm_daddr, { "Destination Device Address", "irlap.snrm.daddr", FT_UINT32, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_snrm_ca, { "Connection Address", "irlap.snrm.ca", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_negotiation_param, { "Negotiation Parameter", "irlap.negotiation", FT_NONE, BASE_NONE, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_param_pi, { "Parameter Identifier", "irlap.pi", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_param_pl, { "Parameter Length", "irlap.pl", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_param_pv, { "Parameter Value", "irlap.pv", - FT_BYTES, BASE_HEX, NULL, 0, - "", HFILL }}, + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_ua_saddr, { "Source Device Address", "irlap.ua.saddr", FT_UINT32, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_ua_daddr, { "Destination Device Address", "irlap.ua.daddr", FT_UINT32, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_xid_ident, { "Format Identifier", "irlap.xid.fi", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_xid_saddr, { "Source Device Address", "irlap.xid.saddr", FT_UINT32, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_xid_daddr, { "Destination Device Address", "irlap.xid.daddr", FT_UINT32, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_xid_flags, { "Discovery Flags", "irlap.xid.flags", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_xid_s, { "Number of Slots", "irlap.xid.s", FT_UINT8, BASE_DEC, VALS(&xid_slot_numbers), S_MASK, - "", HFILL }}, + NULL, HFILL }}, { &hf_xid_conflict, { "Conflict", "irlap.xid.conflict", FT_BOOLEAN, 8, TFS(&set_notset), CONFLICT, - "", HFILL }}, + NULL, HFILL }}, { &hf_xid_slotnr, { "Slot Number", "irlap.xid.slotnr", FT_UINT8, BASE_DEC, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_xid_version, { "Version Number", "irlap.xid.version", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }} + NULL, HFILL }} }; static hf_register_info hf_log[] = { { &hf_log_msg, { "Message", "log.msg", FT_STRING, BASE_NONE, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_log_missed, { "WARNING: Missed one or more messages while capturing!", "log.missed", FT_NONE, BASE_NONE, NULL, 0, - "", HFILL }} + NULL, HFILL }} }; static hf_register_info hf_lmp[] = { { &hf_lmp_xid_hints, { "Service Hints", "irlmp.xid.hints", - FT_BYTES, BASE_HEX, NULL, 0, - "", HFILL }}, + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_lmp_xid_charset, { "Character Set", "irlmp.xid.charset", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_xid_name, { "Device Nickname", "irlmp.xid.name", FT_STRING, BASE_NONE, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_xid_name_no_ascii, { "Device Nickname (unsupported character set)", "irlmp.xid.name", FT_BYTES, BASE_NONE, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_dst, { "Destination", "irlmp.dst", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_dst_control, { "Control Bit", "irlmp.dst.c", FT_BOOLEAN, 8, TFS(&set_notset), CONTROL_BIT, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_dst_lsap, { "Destination LSAP", "irlmp.dst.lsap", FT_UINT8, BASE_DEC, NULL, ~CONTROL_BIT, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_src, { "Source", "irlmp.src", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_src_r, { "reserved", "irlmp.src.r", FT_UINT8, BASE_DEC, NULL, RESERVED_BIT, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_src_lsap, { "Source LSAP", "irlmp.src.lsap", FT_UINT8, BASE_DEC, NULL, ~RESERVED_BIT, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_opcode, { "Opcode", "irlmp.opcode", FT_UINT8, BASE_HEX, VALS(lmp_opcode_vals), 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_rsvd, { "Reserved", "irlmp.rsvd", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_reason, { "Reason", "irlmp.reason", FT_UINT8, BASE_HEX, VALS(lmp_reason_vals), 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_mode, { "Mode", "irlmp.mode", FT_UINT8, BASE_HEX, VALS(lmp_mode_vals), 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_status, { "Status", "irlmp.status", FT_UINT8, BASE_HEX, VALS(lmp_status_vals), 0x0, - "", HFILL }} + NULL, HFILL }} }; static hf_register_info hf_iap[] = { { &hf_iap_ctl, { "Control Field", "iap.ctl", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_ctl_lst, { "Last Frame", "iap.ctl.lst", FT_BOOLEAN, 8, TFS(&set_notset), IAP_LST, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_ctl_ack, { "Acknowledge", "iap.ctl.ack", FT_BOOLEAN, 8, TFS(&set_notset), IAP_ACK, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_ctl_opcode, { "Opcode", "iap.ctl.opcode", FT_UINT8, BASE_HEX, VALS(iap_opcode_vals), IAP_OP, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_class_name, { "Class Name", "iap.classname", FT_UINT_STRING, BASE_NONE, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_attr_name, { "Attribute Name", "iap.attrname", FT_UINT_STRING, BASE_NONE, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_return, { "Return", "iap.return", FT_UINT8, BASE_HEX, VALS(iap_return_vals), 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_list_len, { "List Length", "iap.listlen", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_list_entry, - { "List Entry ", "iap.listentry", + { "List Entry", "iap.listentry", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_obj_id, { "Object Identifier", "iap.objectid", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_attr_type, { "Type", "iap.attrtype", FT_UINT8, BASE_DEC, VALS(iap_attr_type_vals), 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_int, { "Value", "iap.int", FT_INT32, BASE_DEC, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_seq_len, { "Sequence Length", "iap.seqlen", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_oct_seq, { "Sequence", "iap.octseq", - FT_BYTES, BASE_HEX, NULL, 0x0, - "", HFILL }}, + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL }}, { &hf_iap_char_set, { "Character Set", "iap.charset", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_string, { "String", "iap.string", FT_UINT_STRING, BASE_NONE, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_invaloctet, { "Malformed IAP result: \"", "iap.invaloctet", FT_NONE, BASE_NONE, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_invallsap, { "Malformed IAP result: \"", "iap.invallsap", FT_NONE, BASE_NONE, NULL, 0, - "", HFILL }} + NULL, HFILL }} }; static hf_register_info hf_ttp[] = { { &hf_ttp_p, { "Parameter Bit", "ttp.p", FT_BOOLEAN, 8, TFS(&set_notset), TTP_PARAMETERS, - "", HFILL }}, + NULL, HFILL }}, { &hf_ttp_icredit, { "Initial Credit", "ttp.icredit", FT_UINT8, BASE_DEC, NULL, ~TTP_PARAMETERS, - "", HFILL }}, + NULL, HFILL }}, { &hf_ttp_m, { "More Bit", "ttp.m", FT_BOOLEAN, 8, TFS(&set_notset), TTP_MORE, - "", HFILL }}, + NULL, HFILL }}, { &hf_ttp_dcredit, { "Delta Credit", "ttp.dcredit", FT_UINT8, BASE_DEC, NULL, ~TTP_MORE, - "", HFILL }} + NULL, HFILL }} }; /* Setup protocol subtree arrays */ diff --git a/plugins/irda/packet-sir.c b/plugins/irda/packet-sir.c index b8803562a3..26541d6287 100644 --- a/plugins/irda/packet-sir.c +++ b/plugins/irda/packet-sir.c @@ -200,31 +200,31 @@ proto_register_irsir(void) { &hf_sir_bof, { "Beginning of frame", "sir.bof", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_sir_ce, { "Command escape", "sir.ce", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_sir_eof, { "End of frame", "sir.eof", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_sir_fcs, { "Frame check sequence", "sir.fcs", FT_UINT16, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_sir_fcs_bad, { "Bad frame check sequence", "sir.fcs_bad", - FT_BOOLEAN, BASE_NONE, NULL, 0, - "", HFILL }}, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, + NULL, HFILL }}, { &hf_sir_length, { "Length", "sir.length", FT_UINT16, BASE_DEC, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_sir_preamble, { "Preamble", "sir.preamble", FT_BYTES, BASE_NONE, NULL, 0, - "", HFILL }} + NULL, HFILL }} }; proto_sir = proto_register_protocol( -- cgit v1.2.3