diff options
33 files changed, 65 insertions, 65 deletions
diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c index e47da5cb6b..9eb82ab37f 100644 --- a/asn1/kerberos/packet-kerberos-template.c +++ b/asn1/kerberos/packet-kerberos-template.c @@ -1726,7 +1726,7 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Do some sanity checking here, * All krb5 packets start with a TAG class that is BER_CLASS_APP * and a tag value that is either of the values below: - * If it doesnt look like kerberos, return 0 and let someone else have + * If it doesn't look like kerberos, return 0 and let someone else have * a go at it. */ gint8 tmp_class; @@ -1965,7 +1965,7 @@ void proto_register_kerberos(void) { static ei_register_info ei[] = { { &ei_kerberos_decrypted_keytype, { "kerberos.decrypted_keytype", PI_SECURITY, PI_CHAT, "Decryted keytype", EXPFILL }}, - { &ei_kerberos_address, { "kerberos.address.unknown", PI_UNDECODED, PI_WARN, "KRB Address: I dont know how to parse this type of address yet", EXPFILL }}, + { &ei_kerberos_address, { "kerberos.address.unknown", PI_UNDECODED, PI_WARN, "KRB Address: I don't know how to parse this type of address yet", EXPFILL }}, { &ei_krb_gssapi_dlglen, { "kerberos.gssapi.dlglen.error", PI_MALFORMED, PI_ERROR, "DlgLen is not the same as number of bytes remaining", EXPFILL }}, }; diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c index 03d806a314..12fd428de0 100644 --- a/asn1/ldap/packet-ldap-template.c +++ b/asn1/ldap/packet-ldap-template.c @@ -624,7 +624,7 @@ dissect_ldap_AssertionValue(gboolean implicit_tag, tvbuff_t *tvb, int offset, as * Special case these attributes and decode them more nicely. * * Add more special cases as required to prettify further - * (there cant be that many ones that are truly interesting) + * (there can't be that many ones that are truly interesting) */ if(attributedesc_string && !strncmp("DomainSid", attributedesc_string, 9)){ tvbuff_t *sid_tvb; @@ -680,7 +680,7 @@ dissect_ldap_AssertionValue(gboolean implicit_tag, tvbuff_t *tvb, int offset, as * for LDAP, and using that to determine how to display * attribute values and assertion values? * - * -- I dont think there are full schemas available that describe the + * -- I don't think there are full schemas available that describe the * interesting cases i.e. AD -- ronnie */ str=tvb_get_ptr(tvb, offset, len); @@ -814,7 +814,7 @@ ldap_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu /* this a a request - add it to the unmatched list */ - /* check that we dont already have one of those in the + /* check that we don't already have one of those in the unmatched list and if so remove it */ lcr.messageId=messageId; @@ -822,7 +822,7 @@ ldap_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu if(lcrp){ g_hash_table_remove(ldap_info->unmatched, lcrp); } - /* if we cant reuse the old one, grab a new chunk */ + /* if we can't reuse the old one, grab a new chunk */ if(!lcrp){ lcrp=wmem_new0(wmem_file_scope(), ldap_call_response_t); } @@ -1829,7 +1829,7 @@ this_was_not_sasl: /* check that length makes sense */ get_ber_length(tvb, 1, &ldap_len, &ind); - /* dont check ind since indefinite length is never used for ldap (famous last words)*/ + /* don't check ind since indefinite length is never used for ldap (famous last words)*/ if(ldap_len<2){ goto this_was_not_normal_ldap; } diff --git a/asn1/nbap/nbap.cnf b/asn1/nbap/nbap.cnf index deed9d7774..cb023fbd09 100644 --- a/asn1/nbap/nbap.cnf +++ b/asn1/nbap/nbap.cnf @@ -1264,7 +1264,7 @@ BindingID_port = 0; &null_addr, PT_UDP, BindingID_port, 0, NO_ADDR_B|NO_PORT_B); - /* We must also check if this port is about to be overriden, if thats the case we + /* We must also check if this port is about to be overriden, if that's the case we * might already have a DCH entry on this port which should be overwritten */ if (conversation == NULL || ((umts_fp_conversation_info_t*)conversation_get_proto_data(conversation, proto_fp))->channel == CHANNEL_DCH) { diff --git a/asn1/ros/packet-ros-template.c b/asn1/ros/packet-ros-template.c index cdfa73e3cb..caecb74768 100644 --- a/asn1/ros/packet-ros-template.c +++ b/asn1/ros/packet-ros-template.c @@ -314,7 +314,7 @@ ros_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui if(isInvoke) { /* this a a request - add it to the unmatched list */ - /* check that we dont already have one of those in the + /* check that we don't already have one of those in the unmatched list and if so remove it */ rcr.invokeId=invokeId; @@ -325,7 +325,7 @@ ros_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui g_hash_table_remove(ros_info->unmatched, rcrp); } - /* if we cant reuse the old one, grab a new chunk */ + /* if we can't reuse the old one, grab a new chunk */ if(!rcrp){ rcrp=wmem_new(wmem_file_scope(), ros_call_response_t); } diff --git a/asn1/rrc/rrc.cnf b/asn1/rrc/rrc.cnf index f53486278e..c806644647 100644 --- a/asn1/rrc/rrc.cnf +++ b/asn1/rrc/rrc.cnf @@ -724,7 +724,7 @@ HNBName TYPE=FT_STRING DISPLAY=STR_UNICODE expert_add_info(actx->pinfo, actx->created_item, &ei_rrc_no_hrnti); } else{ - /*If it doesnt exists, insert it*/ + /*If it doesn't exists, insert it*/ if( (cur_val=(gint *)g_tree_lookup(hsdsch_muxed_flows, GUINT_TO_POINTER((guint)rrcinf->hrnti[actx->pinfo->fd->subnum]))) == NULL ){ flowd_p = (guint*)g_malloc0(sizeof(gint)); @@ -760,7 +760,7 @@ HNBName TYPE=FT_STRING DISPLAY=STR_UNICODE expert_add_info(actx->pinfo, actx->created_item, &ei_rrc_no_hrnti); } else{ - /*If it doesnt exists, insert it*/ + /*If it doesn't exists, insert it*/ if( (cur_val=(gint *)g_tree_lookup(hsdsch_muxed_flows, GUINT_TO_POINTER((guint)rrcinf->hrnti[actx->pinfo->fd->subnum]))) == NULL ){ flowd_p = (guint*)g_malloc0(sizeof(gint)); diff --git a/asn1/spnego/packet-spnego-template.c b/asn1/spnego/packet-spnego-template.c index f0f80789ca..bdd0fdc365 100644 --- a/asn1/spnego/packet-spnego-template.c +++ b/asn1/spnego/packet-spnego-template.c @@ -544,7 +544,7 @@ decrypt_arcfour(packet_info *pinfo, datalen -= padlen; } - /* dont know what the checksum looks like for dce style gssapi */ + /* don't know what the checksum looks like for dce style gssapi */ if(pinfo->decrypt_gssapi_tvb==DECRYPT_GSSAPI_NORMAL){ ret = arcfour_mic_cksum(key_value, key_size, KRB5_KU_USAGE_SEAL, @@ -584,7 +584,7 @@ decrypt_gssapi_krb_arcfour_wrap(proto_tree *tree _U_, packet_info *pinfo, tvbuff length=tvb_captured_length(pinfo->gssapi_encrypted_tvb); original_data=tvb_get_ptr(pinfo->gssapi_encrypted_tvb, 0, length); - /* dont do anything if we are not attempting to decrypt data */ + /* don't do anything if we are not attempting to decrypt data */ /* if(!krb_decrypt){ return; @@ -694,7 +694,7 @@ decrypt_gssapi_krb_cfx_wrap(proto_tree *tree _U_, int datalen; tvbuff_t *next_tvb; - /* dont do anything if we are not attempting to decrypt data */ + /* don't do anything if we are not attempting to decrypt data */ if(!krb_decrypt){ return; } @@ -831,7 +831,7 @@ dissect_spnego_krb5_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo len=tvb_reported_length_remaining(tvb,offset); if(len>tvb_captured_length_remaining(tvb, offset)){ /* no point in trying to decrypt, - we dont have the full pdu. + we don't have the full pdu. */ return offset; } @@ -1074,7 +1074,7 @@ dissect_spnego_krb5_cfx_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo len=tvb_reported_length_remaining(tvb,offset); if(len>tvb_captured_length_remaining(tvb, offset)){ /* no point in trying to decrypt, - we dont have the full pdu. + we don't have the full pdu. */ return offset; } diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c index 8e854f5da9..bad4dee392 100644 --- a/asn1/x509af/packet-x509af-template.c +++ b/asn1/x509af/packet-x509af-template.c @@ -125,8 +125,8 @@ void proto_reg_handoff_x509af(void) { #include "packet-x509af-dis-tab.c" - /*XXX these should really go to a better place but since that - I have not that ITU standard, ill put it here for the time + /*XXX these should really go to a better place but since + I have not that ITU standard, I'll put it here for the time being. Only implemented those algorithms that take no parameters for the time being, ronnie diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c index d49a5c8080..a5840f573b 100644 --- a/capchild/capture_sync.c +++ b/capchild/capture_sync.c @@ -615,7 +615,7 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, voi si.wShowWindow = SW_HIDE; /* this hides the console window */ #if defined(_WIN32) /* needs first a check if NULL * - * otherwise wouldnt work with non extcap interfaces */ + * otherwise wouldn't work with non extcap interfaces */ if(interface_opts.extcap_fifo != NULL) { if(strncmp(interface_opts.extcap_fifo,"\\\\.\\pipe\\",9)== 0) diff --git a/caputils/ws80211_utils.c b/caputils/ws80211_utils.c index 21f8a8a673..a0e3973e63 100644 --- a/caputils/ws80211_utils.c +++ b/caputils/ws80211_utils.c @@ -411,7 +411,7 @@ static int __ws80211_get_iface_info(const char *name, struct __iface_info *iface if (nl80211_do_cmd(msg, cb)) return -1; - /* Old kernels cant get the current freq via netlink. Try WEXT too :( */ + /* Old kernels can't get the current freq via netlink. Try WEXT too :( */ if (iface_info->pub->current_freq == -1) iface_info->pub->current_freq = get_freq_wext(name); return 0; diff --git a/epan/conversation_table.c b/epan/conversation_table.c index bd39b824f2..44f5a75217 100644 --- a/epan/conversation_table.c +++ b/epan/conversation_table.c @@ -594,7 +594,7 @@ add_conversation_table_data_with_conv_id( port1 = dst_port; } - /* if we dont have any entries at all yet */ + /* if we don't have any entries at all yet */ if (ch->conv_array == NULL) { ch->conv_array = g_array_sized_new(FALSE, FALSE, sizeof(conv_item_t), 10000); @@ -617,7 +617,7 @@ add_conversation_table_data_with_conv_id( } } - /* if we still dont know what conversation this is it has to be a new one + /* if we still don't know what conversation this is it has to be a new one and we have to allocate it and append it to the end of the list */ if (conv_item == NULL) { conv_key_t *new_key; @@ -722,7 +722,7 @@ add_hostlist_table_data(conv_hash_t *ch, const address *addr, guint32 port, gboo /* XXX should be optimized to allocate n extra entries at a time instead of just one */ - /* if we dont have any entries at all yet */ + /* if we don't have any entries at all yet */ if(ch->conv_array==NULL){ ch->conv_array=g_array_sized_new(FALSE, FALSE, sizeof(hostlist_talker_t), 10000); ch->hashtable = g_hash_table_new_full(host_hash, @@ -742,7 +742,7 @@ add_hostlist_table_data(conv_hash_t *ch, const address *addr, guint32 port, gboo } } - /* if we still dont know what talker this is it has to be a new one + /* if we still don't know what talker this is it has to be a new one and we have to allocate it and append it to the end of the list */ if(talker==NULL){ host_key_t *new_key; diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 22cf3d27ee..f7720fd90d 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -3987,7 +3987,7 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Do some sanity checking here, * All krb5 packets start with a TAG class that is BER_CLASS_APP * and a tag value that is either of the values below: - * If it doesnt look like kerberos, return 0 and let someone else have + * If it doesn't look like kerberos, return 0 and let someone else have * a go at it. */ gint8 tmp_class; @@ -4941,7 +4941,7 @@ void proto_register_kerberos(void) { static ei_register_info ei[] = { { &ei_kerberos_decrypted_keytype, { "kerberos.decrypted_keytype", PI_SECURITY, PI_CHAT, "Decryted keytype", EXPFILL }}, - { &ei_kerberos_address, { "kerberos.address.unknown", PI_UNDECODED, PI_WARN, "KRB Address: I dont know how to parse this type of address yet", EXPFILL }}, + { &ei_kerberos_address, { "kerberos.address.unknown", PI_UNDECODED, PI_WARN, "KRB Address: I don't know how to parse this type of address yet", EXPFILL }}, { &ei_krb_gssapi_dlglen, { "kerberos.gssapi.dlglen.error", PI_MALFORMED, PI_ERROR, "DlgLen is not the same as number of bytes remaining", EXPFILL }}, }; diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 33134c4565..7565586059 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -838,7 +838,7 @@ dissect_ldap_AssertionValue(gboolean implicit_tag, tvbuff_t *tvb, int offset, as * Special case these attributes and decode them more nicely. * * Add more special cases as required to prettify further - * (there cant be that many ones that are truly interesting) + * (there can't be that many ones that are truly interesting) */ if(attributedesc_string && !strncmp("DomainSid", attributedesc_string, 9)){ tvbuff_t *sid_tvb; @@ -894,7 +894,7 @@ dissect_ldap_AssertionValue(gboolean implicit_tag, tvbuff_t *tvb, int offset, as * for LDAP, and using that to determine how to display * attribute values and assertion values? * - * -- I dont think there are full schemas available that describe the + * -- I don't think there are full schemas available that describe the * interesting cases i.e. AD -- ronnie */ str=tvb_get_ptr(tvb, offset, len); @@ -1028,7 +1028,7 @@ ldap_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu /* this a a request - add it to the unmatched list */ - /* check that we dont already have one of those in the + /* check that we don't already have one of those in the unmatched list and if so remove it */ lcr.messageId=messageId; @@ -1036,7 +1036,7 @@ ldap_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu if(lcrp){ g_hash_table_remove(ldap_info->unmatched, lcrp); } - /* if we cant reuse the old one, grab a new chunk */ + /* if we can't reuse the old one, grab a new chunk */ if(!lcrp){ lcrp=wmem_new0(wmem_file_scope(), ldap_call_response_t); } @@ -4745,7 +4745,7 @@ this_was_not_sasl: /* check that length makes sense */ get_ber_length(tvb, 1, &ldap_len, &ind); - /* dont check ind since indefinite length is never used for ldap (famous last words)*/ + /* don't check ind since indefinite length is never used for ldap (famous last words)*/ if(ldap_len<2){ goto this_was_not_normal_ldap; } diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c index 89389a5091..cb3702a85a 100644 --- a/epan/dissectors/packet-nbap.c +++ b/epan/dissectors/packet-nbap.c @@ -28814,7 +28814,7 @@ BindingID_port = 0; &null_addr, PT_UDP, BindingID_port, 0, NO_ADDR_B|NO_PORT_B); - /* We must also check if this port is about to be overriden, if thats the case we + /* We must also check if this port is about to be overriden, if that's the case we * might already have a DCH entry on this port which should be overwritten */ if (conversation == NULL || ((umts_fp_conversation_info_t*)conversation_get_proto_data(conversation, proto_fp))->channel == CHANNEL_DCH) { diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c index 60a4b504ff..007ad77923 100644 --- a/epan/dissectors/packet-ros.c +++ b/epan/dissectors/packet-ros.c @@ -368,7 +368,7 @@ ros_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui if(isInvoke) { /* this a a request - add it to the unmatched list */ - /* check that we dont already have one of those in the + /* check that we don't already have one of those in the unmatched list and if so remove it */ rcr.invokeId=invokeId; @@ -379,7 +379,7 @@ ros_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui g_hash_table_remove(ros_info->unmatched, rcrp); } - /* if we cant reuse the old one, grab a new chunk */ + /* if we can't reuse the old one, grab a new chunk */ if(!rcrp){ rcrp=wmem_new(wmem_file_scope(), ros_call_response_t); } diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index ec4954da95..1b1ae6f79e 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -41438,7 +41438,7 @@ dissect_rrc_DL_TransportChannelType_r5(tvbuff_t *tvb _U_, int offset _U_, asn1_c expert_add_info(actx->pinfo, actx->created_item, &ei_rrc_no_hrnti); } else{ - /*If it doesnt exists, insert it*/ + /*If it doesn't exists, insert it*/ if( (cur_val=(gint *)g_tree_lookup(hsdsch_muxed_flows, GUINT_TO_POINTER((guint)rrcinf->hrnti[actx->pinfo->fd->subnum]))) == NULL ){ flowd_p = (guint*)g_malloc0(sizeof(gint)); @@ -44913,7 +44913,7 @@ dissect_rrc_DL_TransportChannelType_r7(tvbuff_t *tvb _U_, int offset _U_, asn1_c expert_add_info(actx->pinfo, actx->created_item, &ei_rrc_no_hrnti); } else{ - /*If it doesnt exists, insert it*/ + /*If it doesn't exists, insert it*/ if( (cur_val=(gint *)g_tree_lookup(hsdsch_muxed_flows, GUINT_TO_POINTER((guint)rrcinf->hrnti[actx->pinfo->fd->subnum]))) == NULL ){ flowd_p = (guint*)g_malloc0(sizeof(gint)); diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index fb34849e20..5e7cb3c54e 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -996,7 +996,7 @@ decrypt_arcfour(packet_info *pinfo, datalen -= padlen; } - /* dont know what the checksum looks like for dce style gssapi */ + /* don't know what the checksum looks like for dce style gssapi */ if(pinfo->decrypt_gssapi_tvb==DECRYPT_GSSAPI_NORMAL){ ret = arcfour_mic_cksum(key_value, key_size, KRB5_KU_USAGE_SEAL, @@ -1036,7 +1036,7 @@ decrypt_gssapi_krb_arcfour_wrap(proto_tree *tree _U_, packet_info *pinfo, tvbuff length=tvb_captured_length(pinfo->gssapi_encrypted_tvb); original_data=tvb_get_ptr(pinfo->gssapi_encrypted_tvb, 0, length); - /* dont do anything if we are not attempting to decrypt data */ + /* don't do anything if we are not attempting to decrypt data */ /* if(!krb_decrypt){ return; @@ -1146,7 +1146,7 @@ decrypt_gssapi_krb_cfx_wrap(proto_tree *tree _U_, int datalen; tvbuff_t *next_tvb; - /* dont do anything if we are not attempting to decrypt data */ + /* don't do anything if we are not attempting to decrypt data */ if(!krb_decrypt){ return; } @@ -1283,7 +1283,7 @@ dissect_spnego_krb5_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo len=tvb_reported_length_remaining(tvb,offset); if(len>tvb_captured_length_remaining(tvb, offset)){ /* no point in trying to decrypt, - we dont have the full pdu. + we don't have the full pdu. */ return offset; } @@ -1526,7 +1526,7 @@ dissect_spnego_krb5_cfx_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo len=tvb_reported_length_remaining(tvb,offset); if(len>tvb_captured_length_remaining(tvb, offset)){ /* no point in trying to decrypt, - we dont have the full pdu. + we don't have the full pdu. */ return offset; } diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index e51b4631d4..996cd59af3 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -1313,8 +1313,8 @@ void proto_reg_handoff_x509af(void) { /*--- End of included file: packet-x509af-dis-tab.c ---*/ #line 127 "../../asn1/x509af/packet-x509af-template.c" - /*XXX these should really go to a better place but since that - I have not that ITU standard, ill put it here for the time + /*XXX these should really go to a better place but since + I have not that ITU standard, I'll put it here for the time being. Only implemented those algorithms that take no parameters for the time being, ronnie diff --git a/epan/emem.c b/epan/emem.c index b2d2f247b7..eea1ceec09 100644 --- a/epan/emem.c +++ b/epan/emem.c @@ -825,7 +825,7 @@ emem_alloc_chunk(size_t size, emem_pool_t *mem) } #endif - /* make sure we dont try to allocate too much (arbitrary limit) */ + /* make sure we don't try to allocate too much (arbitrary limit) */ DISSECTOR_ASSERT(size<(EMEM_PACKET_CHUNK_SIZE>>2)); if (!mem->free_list) diff --git a/epan/frame_data.c b/epan/frame_data.c index 6f2e4c396f..bf403684f1 100644 --- a/epan/frame_data.c +++ b/epan/frame_data.c @@ -358,7 +358,7 @@ frame_data_set_after_dissect(frame_data *fdata, { /* This frame either passed the display filter list or is marked as a time reference frame. All time reference frames are displayed - even if they dont pass the display filter */ + even if they don't pass the display filter */ if(fdata->flags.ref_time){ /* if this was a TIME REF frame we should reset the cul bytes field */ *cum_bytes = fdata->pkt_len; diff --git a/epan/proto.c b/epan/proto.c index 134e4053f3..06ffa93017 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -88,12 +88,12 @@ struct ptvcursor { @param free_block a code block to call to free resources if this returns @return the header field matching 'hfinfo' */ #define TRY_TO_FAKE_THIS_ITEM_OR_FREE(tree, hfindex, hfinfo, free_block) \ - /* If this item is not referenced we dont have to do much work \ + /* If this item is not referenced we don't have to do much work \ at all but we should still return a node so that field items \ below this node (think proto_item_add_subtree()) will still \ have somewhere to attach to or else filtering will not work \ (they would be ignored since tree would be NULL). \ - DONT try to fake a node where PTREE_FINFO(tree) is NULL \ + DON'T try to fake a node where PTREE_FINFO(tree) is NULL \ since dissectors that want to do proto_item_set_len() or \ other operations that dereference this would crash. \ We fake FT_PROTOCOL unless some clients have requested us \ diff --git a/epan/reassemble.c b/epan/reassemble.c index 87b8e9b879..b4d1daa3fe 100644 --- a/epan/reassemble.c +++ b/epan/reassemble.c @@ -1021,7 +1021,7 @@ fragment_add_work(fragment_head *fd_head, tvbuff_t *tvb, const int offset, if( !(fd_head->flags & FD_DATALEN_SET) ){ - /* if we dont know the datalen, there are still missing + /* if we don't know the datalen, there are still missing * packets. Cheaper than the check below. */ return FALSE; @@ -1737,7 +1737,7 @@ fragment_add_seq_work(fragment_head *fd_head, tvbuff_t *tvb, const int offset, if( !(fd_head->flags & FD_DATALEN_SET) ){ - /* if we dont know the sequence number of the last fragment, + /* if we don't know the sequence number of the last fragment, * there are definitely still missing packets. Cheaper than * the check below. */ diff --git a/epan/req_resp_hdrs.c b/epan/req_resp_hdrs.c index f9ac6f1682..c7d7319fb2 100644 --- a/epan/req_resp_hdrs.c +++ b/epan/req_resp_hdrs.c @@ -379,7 +379,7 @@ req_resp_hdrs_do_reassembly(tvbuff_t *tvb, const int offset, packet_info *pinfo, * until the end of the tcp session, unless there * is a keepalive header present in which case we * assume there is no message body at all and thus - * we wont do any reassembly. + * we won't do any reassembly. * Set up tcp reassembly until the end of this session. */ length_remaining = tvb_captured_length_remaining(tvb, next_offset); @@ -394,7 +394,7 @@ req_resp_hdrs_do_reassembly(tvbuff_t *tvb, const int offset, packet_info *pinfo, if (keepalive_found) { /* We have a keep-alive but no content-length. - * Assume there is no message body and dont + * Assume there is no message body and don't * do any reassembly. */ return TRUE; diff --git a/epan/to_str.c b/epan/to_str.c index 27bf509aff..5b42179001 100644 --- a/epan/to_str.c +++ b/epan/to_str.c @@ -1048,7 +1048,7 @@ decode_numeric_bitfield(const guint32 val, const guint32 mask, const int width, char *p; int shift = 0; - buf=(char *)ep_alloc(1025); /* isnt this a bit overkill? */ + buf=(char *)ep_alloc(1025); /* isn't this a bit overkill? */ /* Compute the number of bits we have to shift the bitfield right to extract its value. */ while ((mask & (1<<shift)) == 0) @@ -2196,7 +2196,7 @@ ref_time_packets(capture_file *cf) if ( (fdata->flags.passed_dfilter) || (fdata->flags.ref_time) ) { /* This frame either passed the display filter list or is marked as a time reference frame. All time reference frames are displayed - even if they dont pass the display filter */ + even if they don't pass the display filter */ if (fdata->flags.ref_time) { /* if this was a TIME REF frame we should reset the cum_bytes field */ cf->cum_bytes = fdata->pkt_len; diff --git a/ui/cli/tap-dcerpcstat.c b/ui/cli/tap-dcerpcstat.c index b9345e81be..19535949e0 100644 --- a/ui/cli/tap-dcerpcstat.c +++ b/ui/cli/tap-dcerpcstat.c @@ -69,11 +69,11 @@ dcerpcstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt _U_, const return 0; } if(!ri->call_data->req_frame){ - /* we have not seen the request so we dont know the delta*/ + /* we have not seen the request so we don't know the delta*/ return 0; } if(ri->call_data->opnum>=rs->num_procedures){ - /* dont handle this since its outside of known table */ + /* don't handle this since its outside of known table */ return 0; } diff --git a/ui/cli/tap-rpcstat.c b/ui/cli/tap-rpcstat.c index 8cc1e2a898..6dc04986d1 100644 --- a/ui/cli/tap-rpcstat.c +++ b/ui/cli/tap-rpcstat.c @@ -128,7 +128,7 @@ rpcstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt _U_, const voi rpc_procedure_t *rp; if(ri->proc>=rs->num_procedures){ - /* dont handle this since its outside of known table */ + /* don't handle this since its outside of known table */ return 0; } /* we are only interested in reply packets */ diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c index 2935f0f2f9..f3476fe1e0 100644 --- a/ui/gtk/iax2_analysis.c +++ b/ui/gtk/iax2_analysis.c @@ -1368,7 +1368,7 @@ dialog_graph_draw(user_data_t* user_data) y_pos = draw_height-1 - (val*draw_height)/max_y + top_y_border; } - /* dont need to draw anything if the segment + /* don't need to draw anything if the segment * is entirely above the top of the graph */ if ( (prev_y_pos == 0) && (y_pos == 0) ) { diff --git a/ui/gtk/io_stat.c b/ui/gtk/io_stat.c index 09755260bd..9182872198 100644 --- a/ui/gtk/io_stat.c +++ b/ui/gtk/io_stat.c @@ -977,7 +977,7 @@ io_stat_draw(io_stat_t *io) switch (io->graphs[i].plot_style) { case PLOT_STYLE_LINE: - /* Dont draw anything if the segment entirely above the top of the graph + /* Don't draw anything if the segment entirely above the top of the graph */ if ( (prev_y_pos != 0) || (y_pos != 0) ) { cairo_move_to(cr, prev_x_pos+0.5, prev_y_pos+0.5); diff --git a/ui/gtk/memory_dlg.c b/ui/gtk/memory_dlg.c index 21bb1a73fa..357b694532 100644 --- a/ui/gtk/memory_dlg.c +++ b/ui/gtk/memory_dlg.c @@ -386,7 +386,7 @@ io_stat_draw(io_stat_t *io) top_y_border); } - /* Dont draw anything if the segment entirely above the top of the graph + /* Don't draw anything if the segment entirely above the top of the graph */ if ( (prev_y_pos != 0) || (y_pos != 0) ) { static GdkRGBA red_color = {1.0, 0.0, 0.1, 1.0}; diff --git a/ui/gtk/ncp_stat.c b/ui/gtk/ncp_stat.c index e8ed0a44e1..63a44a89b3 100644 --- a/ui/gtk/ncp_stat.c +++ b/ui/gtk/ncp_stat.c @@ -303,7 +303,7 @@ ncpstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const voi ncpstat_t *ss=(ncpstat_t *)pss; const ncp_req_hash_value *request_val=(const ncp_req_hash_value *)prv; - /* if we havent seen the request, just ignore it */ + /* if we haven't seen the request, just ignore it */ if(!request_val || request_val->ncp_rec==0){ return 0; } diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c index 14e91ae6df..d282f9fbb1 100644 --- a/ui/gtk/rtp_analysis.c +++ b/ui/gtk/rtp_analysis.c @@ -1423,7 +1423,7 @@ dialog_graph_draw(user_data_t* user_data) y_pos = draw_height - 1 - (val*draw_height)/max_y + top_y_border; } - /* dont need to draw anything if the segment + /* don't need to draw anything if the segment * is entirely above the top of the graph */ if ( (prev_y_pos == 0) && (y_pos == 0) ) { diff --git a/wiretap/nettl.c b/wiretap/nettl.c index 32739e9d3a..72cb1e22be 100644 --- a/wiretap/nettl.c +++ b/wiretap/nettl.c @@ -509,8 +509,8 @@ nettl_read_rec(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, break; case NETTL_SUBSYS_NS_LS_DRIVER : - /* XXX we dont know how to identify this as ethernet frames, so - we assumes everything is. We will crash and burn for anything else */ + /* XXX we don't know how to identify this as ethernet frames, so + we assume everything is. We will crash and burn for anything else */ /* for encapsulated 100baseT we do this */ phdr->pkt_encap = WTAP_ENCAP_NETTL_ETHERNET; bytes_read = file_read(&drv_eth_hdr, NS_LS_DRV_ETH_HDR_LEN, fh); diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c index 888ed250fa..51d1ca3cdd 100644 --- a/wiretap/ngsniffer.c +++ b/wiretap/ngsniffer.c @@ -2245,7 +2245,7 @@ SnifferDecompress(unsigned char *inbuf, size_t inlen, unsigned char *outbuf, /* Process until we've consumed all the input */ while (pin < pin_end) { - /* Shift down the bit mask we use to see whats encoded */ + /* Shift down the bit mask we use to see what's encoded */ bit_mask = bit_mask >> 1; /* If there are no bits left, time to get another 16 bits */ |