diff options
| -rw-r--r-- | epan/dissectors/packet-btavrcp.c | 10 | ||||
| -rw-r--r-- | epan/dissectors/packet-dccp.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-ecmp.c | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-spice.c | 2 | ||||
| -rwxr-xr-x | tools/wireshark_gen.py | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/epan/dissectors/packet-btavrcp.c b/epan/dissectors/packet-btavrcp.c index 23ed1e63cc..c4acb35109 100644 --- a/epan/dissectors/packet-btavrcp.c +++ b/epan/dissectors/packet-btavrcp.c @@ -216,7 +216,7 @@ static expert_field ei_btavrcp_unexpected_data = EI_INIT; static dissector_handle_t btavrcp_handle; -#define OPCODE_VENDOR_DEPENDANT 0x00 +#define OPCODE_VENDOR_DEPENDENT 0x00 #define OPCODE_UNIT 0x30 #define OPCODE_SUBUNIT 0x31 #define OPCODE_PASSTHROUGH 0x7C @@ -345,7 +345,7 @@ static const value_string ctype_vals[] = { }; static const value_string opcode_vals[] = { - { OPCODE_VENDOR_DEPENDANT, "Vendor dependent" }, + { OPCODE_VENDOR_DEPENDENT, "Vendor dependent" }, { OPCODE_UNIT, "Unit Info" }, { OPCODE_SUBUNIT, "Subunit Info" }, { OPCODE_PASSTHROUGH, "Pass Through" }, @@ -1004,7 +1004,7 @@ dissect_subunit(tvbuff_t *tvb, proto_tree *tree, gint offset, gboolean is_comman static gint -dissect_vendor_dependant(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, +dissect_vendor_dependent(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, guint ctype, guint32 *op, guint32 *op_arg, gboolean is_command, avrcp_proto_data_t *avrcp_proto_data) { @@ -2150,8 +2150,8 @@ dissect_btavrcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) case OPCODE_SUBUNIT: offset = dissect_subunit(tvb, btavrcp_tree, offset, is_command); break; - case OPCODE_VENDOR_DEPENDANT: - offset = dissect_vendor_dependant(tvb, pinfo, btavrcp_tree, + case OPCODE_VENDOR_DEPENDENT: + offset = dissect_vendor_dependent(tvb, pinfo, btavrcp_tree, offset, ctype, &op, &op_arg, is_command, &avrcp_proto_data); break; }; diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c index 3c67c5f628..1415042a10 100644 --- a/epan/dissectors/packet-dccp.c +++ b/epan/dissectors/packet-dccp.c @@ -768,7 +768,7 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ " Seq=%" G_GINT64_MODIFIER "u", dccph->seq); - /* dissecting type dependant additional fields */ + /* dissecting type dependent additional fields */ switch (dccph->type) { case 0x0: /* DCCP-Request */ case 0xA: /* DCCP-Listen */ diff --git a/epan/dissectors/packet-ecmp.c b/epan/dissectors/packet-ecmp.c index 91a82b5d36..839c3b01cb 100644 --- a/epan/dissectors/packet-ecmp.c +++ b/epan/dissectors/packet-ecmp.c @@ -644,7 +644,7 @@ static int hf_ecmp_param_format_read_not_allowed = -1; static int hf_ecmp_param_format_protected_from_destinations = -1; static int hf_ecmp_param_format_parameter_not_visible = -1; static int hf_ecmp_param_format_not_clonable = -1; -static int hf_ecmp_param_format_voltage_or_current_rating_dependant = -1; +static int hf_ecmp_param_format_voltage_or_current_rating_dependent = -1; static int hf_ecmp_param_format_parameter_has_no_default = -1; static int hf_ecmp_param_format_number_of_decimal_places = -1; static int hf_ecmp_param_format_variable_maximum_and_minimum = -1; @@ -1591,7 +1591,7 @@ static void get_object_info_response(packet_info* pinfo, int offset, tvbuff_t *t &hf_ecmp_param_format_protected_from_destinations, &hf_ecmp_param_format_parameter_not_visible, &hf_ecmp_param_format_not_clonable, - &hf_ecmp_param_format_voltage_or_current_rating_dependant, + &hf_ecmp_param_format_voltage_or_current_rating_dependent, &hf_ecmp_param_format_parameter_has_no_default, &hf_ecmp_param_format_number_of_decimal_places, &hf_ecmp_param_format_variable_maximum_and_minimum, @@ -3401,7 +3401,7 @@ void proto_register_ecmp (void) { &hf_ecmp_param_format_protected_from_destinations, { "PT- Protected from destinations", "ecmp.param_format.protected_from_destinations", FT_UINT32, BASE_DEC, NULL, 0x00000008, NULL, HFILL }}, { &hf_ecmp_param_format_parameter_not_visible, { "NV- Parameter not visible", "ecmp.param_format.parameter_not_visible", FT_UINT32, BASE_DEC, NULL, 0x00000010, NULL, HFILL }}, { &hf_ecmp_param_format_not_clonable, { "NC- Not clonable", "ecmp.param_format.not_clonable", FT_UINT32, BASE_DEC, NULL, 0x00000020, NULL, HFILL }}, - { &hf_ecmp_param_format_voltage_or_current_rating_dependant, { "RA- Voltage or current rating dependant", "ecmp.param_format.voltage_or_current_rating_dependant", FT_UINT32, BASE_DEC, NULL, 0x00000040, NULL, HFILL }}, + { &hf_ecmp_param_format_voltage_or_current_rating_dependent, { "RA- Voltage or current rating dependent", "ecmp.param_format.voltage_or_current_rating_dependent", FT_UINT32, BASE_DEC, NULL, 0x00000040, NULL, HFILL }}, { &hf_ecmp_param_format_parameter_has_no_default, { "ND- Parameter has no default", "ecmp.param_format.parameter_has_no_default", FT_UINT32, BASE_DEC, NULL, 0x00000080, NULL, HFILL }}, { &hf_ecmp_param_format_number_of_decimal_places, { "DP- Number of Decimal places", "ecmp.param_format.number_of_decimal_places", FT_UINT32, BASE_DEC, NULL, 0x00000F00, NULL, HFILL }}, { &hf_ecmp_param_format_variable_maximum_and_minimum, { "VM- Variable maximum and minimum", "ecmp.param_format.variable_maximum_and_minimum", FT_UINT32, BASE_DEC, NULL, 0x00001000, NULL, HFILL }}, diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c index ba87f8ed55..ae85b86263 100644 --- a/epan/dissectors/packet-spice.c +++ b/epan/dissectors/packet-spice.c @@ -1723,7 +1723,7 @@ dissect_spice_record_client(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 4; proto_tree_add_item(record_tree, hf_audio_mode, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - /* TODO - mode dependant, there may be more data here */ + /* TODO - mode dependent, there may be more data here */ break; default: expert_add_info_format(pinfo, msgtype_item, &ei_spice_unknown_message, "Unknown record client message - cannot dissect"); diff --git a/tools/wireshark_gen.py b/tools/wireshark_gen.py index 250a434791..5bc4deddbc 100755 --- a/tools/wireshark_gen.py +++ b/tools/wireshark_gen.py @@ -586,7 +586,7 @@ class wireshark_gen_C: # static const char get_Penguin_Echo_get_width_at[] = "_get_width" ; # static const char set_Penguin_Echo_set_width_at[] = "_set_width" ; # - # TODO: Implement some language dependant templates to handle naming conventions + # TODO: Implement some language dependent templates to handle naming conventions # language <=> attribute. for C, C++. Java etc # # OR, just add a runtime GUI option to select language binding for attributes -- FS @@ -2883,7 +2883,7 @@ static const value_string @valstringname@[] = { """ # - # get/set accessor method names are language mapping dependant. + # get/set accessor method names are language mapping dependent. # template_attributes_declare_Java_get = """static const char get_@sname@_at[] = \"_get_@atname@\" ;""" |