diff --git a/epan/dissectors/dcerpc/drsuapi/drsuapi.cnf b/epan/dissectors/dcerpc/drsuapi/drsuapi.cnf index 41491c3ec1..a3044ca1f2 100644 --- a/epan/dissectors/dcerpc/drsuapi/drsuapi.cnf +++ b/epan/dissectors/dcerpc/drsuapi/drsuapi.cnf @@ -1,6 +1,6 @@ # # -#We dont know this type yet +#We don't know this type yet TYPE a_string drsuapi_dissect_a_string FT_STRING BASE_NONE 0 NULL 4 # # this one is better/easier to just implement by hand diff --git a/epan/dissectors/dcerpc/idl2wrs.c b/epan/dissectors/dcerpc/idl2wrs.c index d45e860aa8..a0e3d4658e 100644 --- a/epan/dissectors/dcerpc/idl2wrs.c +++ b/epan/dissectors/dcerpc/idl2wrs.c @@ -306,7 +306,7 @@ check_hf_rename_refcount(void) { hf_rename_item_t *hri; - /* dont generate code for renamed hf fields just return the new name*/ + /* don't generate code for renamed hf fields just return the new name*/ for(hri=hf_rename_list;hri;hri=hri->next){ if(!hri->refcount){ FPRINTF(stderr, "ERROR: the hf_rename field:%s was never referenced. it is likely the conformance file is stale\n", hri->old_name); @@ -345,7 +345,7 @@ register_hf_field(const char *hf_name, const char *title, const char *filter_nam hf_field_item_t *hfi; hf_rename_item_t *hri; - /* dont generate code for renamed hf fields just return the new name*/ + /* don't generate code for renamed hf fields just return the new name*/ for(hri=hf_rename_list;hri;hri=hri->next){ if(!strncmp(hf_name, hri->old_name, strlen(hf_name))){ hfi=find_hf_field(hri->new_name); @@ -554,13 +554,13 @@ parsebrackets(token_item_t *ti, bracket_item_t **bracket){ continue; } - /* public : we dont care about this one */ + /* public : we don't care about this one */ if(!g_strcmp0(ti->str, "public")){ ti=ti->next; continue; } - /* gensize : we dont care about this one */ + /* gensize : we don't care about this one */ if(!g_strcmp0(ti->str, "gensize")){ ti=ti->next; continue; @@ -591,7 +591,7 @@ parsebrackets(token_item_t *ti, bracket_item_t **bracket){ continue; } - /* value we dont care about this one so just skip it */ + /* value we don't care about this one so just skip it */ if(!g_strcmp0(ti->str, "value")){ int level; ti=ti->next; @@ -619,7 +619,7 @@ parsebrackets(token_item_t *ti, bracket_item_t **bracket){ continue; } - /* range we dont care about this one so just skip it */ + /* range we don't care about this one so just skip it */ if(!g_strcmp0(ti->str, "range")){ int level; ti=ti->next; @@ -647,7 +647,7 @@ parsebrackets(token_item_t *ti, bracket_item_t **bracket){ continue; } - /* flag we dont care about this one so just skip it */ + /* flag we don't care about this one so just skip it */ if(!g_strcmp0(ti->str, "flag")){ int level; ti=ti->next; @@ -1549,7 +1549,7 @@ static void parsetypedefstruct(int pass) /* this is pass 0 so reset alignment to zero and update as items are processed. we need alignment when pass 1 is run. - set alignment initially to 1 so we dont fail for empty structs + set alignment initially to 1 so we don't fail for empty structs */ if(pass==0){ alignment=1; diff --git a/epan/dissectors/packet-cattp.c b/epan/dissectors/packet-cattp.c index c5fb654a15..2a20d0d6d4 100644 --- a/epan/dissectors/packet-cattp.c +++ b/epan/dissectors/packet-cattp.c @@ -31,9 +31,9 @@ /* bit masks for the first header byte. */ #define M_FLAGS 0xFC /* flags only, no version */ -#define M_PDU_SYN 0xB8 /* SYN (ACK, SEG dont care) without version */ -#define M_PDU_ACK 0xD0 /* ACK (EAK, SEG, NUL dont care) without version */ -#define M_PDU_RST 0xBC /* RST (ACK dont care) without version */ +#define M_PDU_SYN 0xB8 /* SYN (ACK, SEG don't care) without version */ +#define M_PDU_ACK 0xD0 /* ACK (EAK, SEG, NUL don't care) without version */ +#define M_PDU_RST 0xBC /* RST (ACK don't care) without version */ #define M_VERSION 0x03 /* only Version */ #define ICCID_PREFIX 0x98 diff --git a/epan/dissectors/packet-ebhscr.c b/epan/dissectors/packet-ebhscr.c index 2931531722..add109280e 100644 --- a/epan/dissectors/packet-ebhscr.c +++ b/epan/dissectors/packet-ebhscr.c @@ -79,7 +79,7 @@ static int hf_ts_utc_leap_sec = -1; static int hf_ts_sync_state = -1; static int hf_dio_overflow_mon_unit = -1; -static int hf_dio_jump_occured = -1; +static int hf_dio_jump_occurred = -1; static int hf_dio_value_type = -1; static int hf_dio_reserved_bytes = -1; @@ -251,7 +251,7 @@ static const value_string ts_sync_state_strings[] = { static int * const dio_status_bits[] = { &hf_dio_overflow_mon_unit, - &hf_dio_jump_occured, + &hf_dio_jump_occurred, NULL }; @@ -887,11 +887,11 @@ proto_register_ebhscr(void) NULL, 0x0001, "Set to 1 in case of an overflow in the monitoring unit. In this case all remaining fields are invalid.", HFILL } }, - { &hf_dio_jump_occured, - { "Time jump occured", "ebhscr.dio.jump_occ", + { &hf_dio_jump_occurred, + { "Time jump occurred", "ebhscr.dio.jump_occ", FT_BOOLEAN, 16, NULL, 0x0400, - "Set to 1 if a time jump occured near the edge and thus the timestamp was estimated.", HFILL } + "Set to 1 if a time jump occurred near the edge and thus the timestamp was estimated.", HFILL } }, { &hf_dio_value_type, { "Digital IO value type", "ebhscr.dio.valtype", diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 975072bd08..3e4e7ff888 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -31559,9 +31559,9 @@ dissect_ieee80211_vht_ndp_annc(tvbuff_t *tvb, packet_info *pinfo _U_, if ((sounding_dialog_token & 0x03) == 0x00) { proto_item_append_text(dialog, " VHT NDP Announcement"); } else if ((sounding_dialog_token & 0x03) == 0x02) { - proto_item_append_text(dialog, " HE NDP Annoucement"); + proto_item_append_text(dialog, " HE NDP Announcement"); } else if ((sounding_dialog_token & 0x03) == 0x01) { - proto_item_append_text(dialog, " Ranging NDP Annoucement"); + proto_item_append_text(dialog, " Ranging NDP Announcement"); } offset++; diff --git a/epan/dissectors/packet-signal-pdu.c b/epan/dissectors/packet-signal-pdu.c index bb4e60aac7..58427bc7e9 100644 --- a/epan/dissectors/packet-signal-pdu.c +++ b/epan/dissectors/packet-signal-pdu.c @@ -991,7 +991,7 @@ post_update_spdu_someip_mapping_cb(void) { data_spdu_someip_mappings = NULL; } - /* we dont need to free the data as long as we don't alloc it first */ + /* we don't need to free the data as long as we don't alloc it first */ data_spdu_someip_mappings = g_hash_table_new_full(g_int64_hash, g_int64_equal, &spdu_payload_free_key, NULL); if (data_spdu_someip_mappings == NULL || spdu_someip_mapping == NULL) { @@ -1054,7 +1054,7 @@ post_update_spdu_can_mapping_cb(void) { data_spdu_can_mappings = NULL; } - /* we dont need to free the data as long as we don't alloc it first */ + /* we don't need to free the data as long as we don't alloc it first */ data_spdu_can_mappings = g_hash_table_new_full(g_int64_hash, g_int64_equal, &spdu_payload_free_key, NULL); if (data_spdu_can_mappings == NULL || spdu_can_mapping == NULL) { @@ -1142,7 +1142,7 @@ post_update_spdu_flexray_mapping_cb(void) { data_spdu_flexray_mappings = NULL; } - /* we dont need to free the data as long as we don't alloc it first */ + /* we don't need to free the data as long as we don't alloc it first */ data_spdu_flexray_mappings = g_hash_table_new_full(g_int64_hash, g_int64_equal, &spdu_payload_free_key, NULL); if (data_spdu_flexray_mappings == NULL || spdu_flexray_mapping == NULL) { @@ -1220,7 +1220,7 @@ post_update_spdu_lin_mapping_cb(void) { data_spdu_lin_mappings = NULL; } - /* we dont need to free the data as long as we don't alloc it first */ + /* we don't need to free the data as long as we don't alloc it first */ data_spdu_lin_mappings = g_hash_table_new_full(g_int_hash, g_int_equal, &spdu_payload_free_key, NULL); if (data_spdu_lin_mappings == NULL || spdu_lin_mapping == NULL) { @@ -1300,7 +1300,7 @@ post_update_spdu_pdu_transport_mapping_cb(void) { data_spdu_pdu_transport_mappings = NULL; } - /* we dont need to free the data as long as we don't alloc it first */ + /* we don't need to free the data as long as we don't alloc it first */ data_spdu_pdu_transport_mappings = g_hash_table_new_full(g_int64_hash, g_int64_equal, &spdu_payload_free_key, NULL); if (data_spdu_pdu_transport_mappings == NULL || spdu_pdu_transport_mapping == NULL) { diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index 3c25541a3b..31b085ae15 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -3501,7 +3501,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info const gchar *proto_name; void *tmp; - /* For SIP messages with other sip messages embeded in the body, dont export those individually. + /* For SIP messages with other sip messages embeded in the body, don't export those individually. * E.g. if we are called from the mime_multipart dissector don't export the message. */ cur = wmem_list_frame_prev(wmem_list_tail(pinfo->layers)); diff --git a/epan/dissectors/packet-someip.c b/epan/dissectors/packet-someip.c index c1d9fc9405..9e5b856195 100644 --- a/epan/dissectors/packet-someip.c +++ b/epan/dissectors/packet-someip.c @@ -1201,7 +1201,7 @@ post_update_someip_parameter_enum_read_in_data(someip_parameter_enum_uat_t *data /* create new entry ... */ g_hash_table_insert(ht, key, list); } else { - /* dont need it anymore */ + /* don't need it anymore */ wmem_free(wmem_epan_scope(), key); } @@ -1653,7 +1653,7 @@ post_update_someip_parameter_union_read_in_data(someip_parameter_union_uat_t *da /* create new entry ... */ g_hash_table_insert(ht, key, list); } else { - /* dont need it anymore */ + /* don't need it anymore */ wmem_free(wmem_epan_scope(), key); } @@ -1758,7 +1758,7 @@ post_update_someip_parameter_base_type_list_cb(void) { data_someip_parameter_base_type_list = NULL; } - /* we dont need to free the data as long as we don't alloc it first */ + /* we don't need to free the data as long as we don't alloc it first */ data_someip_parameter_base_type_list = g_hash_table_new_full(g_int64_hash, g_int64_equal, &someip_payload_free_key, NULL); if (data_someip_parameter_base_type_list == NULL || someip_parameter_base_type_list == NULL || someip_parameter_base_type_list_num == 0) { @@ -1857,7 +1857,7 @@ post_update_someip_parameter_string_list_cb(void) { data_someip_parameter_strings = NULL; } - /* we dont need to free the data as long as we don't alloc it first */ + /* we don't need to free the data as long as we don't alloc it first */ data_someip_parameter_strings = g_hash_table_new_full(g_int64_hash, g_int64_equal, &someip_payload_free_key, NULL); if (data_someip_parameter_strings == NULL || someip_parameter_strings == NULL || someip_parameter_strings_num == 0) { @@ -1926,7 +1926,7 @@ post_update_someip_parameter_typedef_list_cb(void) { data_someip_parameter_typedefs = NULL; } - /* we dont need to free the data as long as we don't alloc it first */ + /* we don't need to free the data as long as we don't alloc it first */ data_someip_parameter_typedefs = g_hash_table_new_full(g_int64_hash, g_int64_equal, &someip_payload_free_key, NULL); if (data_someip_parameter_typedefs == NULL || someip_parameter_typedefs == NULL || someip_parameter_typedefs_num == 0) { @@ -1984,7 +1984,7 @@ get_param_attributes(guint8 data_type, guint32 id_ref) { /* we limit the number of typedef recursion to "count" */ while (data_type == SOMEIP_PAYLOAD_PARAMETER_DATA_TYPE_TYPEDEF && count > 0) { someip_payload_parameter_typedef_t *tmp = get_typedef_config(id_ref); - /* this should not be a typedef since we dont support recursion of typedefs */ + /* this should not be a typedef since we don't support recursion of typedefs */ if (tmp != NULL) { data_type = tmp->data_type; id_ref = tmp->id_ref; @@ -2065,7 +2065,7 @@ get_param_attributes(guint8 data_type, guint32 id_ref) { } } - /* all other types are handled or dont need a type! */ + /* all other types are handled or don't need a type! */ return ret; } @@ -4011,7 +4011,7 @@ proto_register_someip(void) { prefs_register_bool_preference(someip_module, "payload_dissector_wtlv_default", "Try WTLV payload dissection for unconfigured messages (not pure SOME/IP)", - "Should the SOME/IP Dissector use the payload dissector with the experimental WTLV encoding for unconfigured messsages?", + "Should the SOME/IP Dissector use the payload dissector with the experimental WTLV encoding for unconfigured messages?", &someip_derserializer_wtlv_default); prefs_register_uat_preference(someip_module, "_someip_parameter_list", "SOME/IP Parameter List", diff --git a/epan/dissectors/packet-thrift.c b/epan/dissectors/packet-thrift.c index b779e3c967..b41dd1a0e5 100644 --- a/epan/dissectors/packet-thrift.c +++ b/epan/dissectors/packet-thrift.c @@ -2451,7 +2451,7 @@ Framed Transport can encapsulate any protocol version: * * Returns: * - THRIFT_REQUEST_REASSEMBLY = -1 if reassembly is required - * - 0 if an error occured + * - 0 if an error occurred * - offset > 0 to indicate the end of the PDU in case of success * * This method MUST be called with non-null thrift_opt. diff --git a/tools/wireshark_be.py b/tools/wireshark_be.py index b5e0a5b464..02fcf5ab35 100755 --- a/tools/wireshark_be.py +++ b/tools/wireshark_be.py @@ -219,7 +219,7 @@ def run(tree, args): # # Assumption: Name is of the form abcdefg.xyz (eg: CosNaming.idl) - fname = path.basename(tree.file()) # grab basename only, dont care about path + fname = path.basename(tree.file()) # grab basename only, don't care about path nl = fname.split(".")[0] # split name of main IDL file using "." as separator # and grab first field (eg: CosNaming) diff --git a/tools/wireshark_gen.py b/tools/wireshark_gen.py index 2c3870a105..d89f1005da 100755 --- a/tools/wireshark_gen.py +++ b/tools/wireshark_gen.py @@ -28,7 +28,7 @@ # # Strategy (sneaky but ...) # -# problem: I dont know what variables to declare until AFTER the helper functions +# problem: I don't know what variables to declare until AFTER the helper functions # have been built, so ... # # There are 2 passes through genHelpers, the first one is there just to @@ -1408,7 +1408,7 @@ class wireshark_gen_C: #print "//XXX clv = ",clv - # if char, dont convert to int, but put inside single quotes so that it is understood by C. + # if char, don't convert to int, but put inside single quotes so that it is understood by C. # eg: if (disc == 'b').. # # TODO : handle \xxx chars generically from a function or table lookup rather than diff --git a/ui/qt/utils/rtp_audio_file.cpp b/ui/qt/utils/rtp_audio_file.cpp index 4aa12b4c1a..591a63bbf3 100644 --- a/ui/qt/utils/rtp_audio_file.cpp +++ b/ui/qt/utils/rtp_audio_file.cpp @@ -181,7 +181,7 @@ bool RtpAudioFile::readFrameSamples(gint32 *read_buff_bytes, SAMPLE **read_buff, guint64 read_bytes = 0; if (!sample_file_frame_->read((char *)&frame_info, sizeof(frame_info))) { - // Can't read frame, some error occured + // Can't read frame, some error occurred return false; } @@ -255,7 +255,7 @@ bool RtpAudioFile::seek(qint64 off) while (1) { // Read frame if (!sample_file_frame_->read((char *)&cur_frame_, sizeof(cur_frame_))) { - // Can't read frame, some error occured + // Can't read frame, some error occurred return false; } diff --git a/wiretap/blf.c b/wiretap/blf.c index 41ad28be80..853467335d 100644 --- a/wiretap/blf.c +++ b/wiretap/blf.c @@ -372,7 +372,7 @@ blf_timestamp_to_ns(blf_logobjectheader_t *header) { break; default: - ws_debug("i dont understand the flags 0x%x", header->flags); + ws_debug("I don't understand the flags 0x%x", header->flags); return 0; break; } diff --git a/wiretap/erf.c b/wiretap/erf.c index b2d96d91db..21dfbb0ae1 100644 --- a/wiretap/erf.c +++ b/wiretap/erf.c @@ -1952,7 +1952,7 @@ static gboolean erf_dump( /* If we have seen a metadata record in the first ~1 second it * means that we are dealing with an ERF file with metadata already in them. - * We dont want to write extra metadata if nothing has changed. We can't + * We don't want to write extra metadata if nothing has changed. We can't * trust the Wireshark representation since we massage the fields on * read. */ /* restart searching for next meta record to update capture comment at */