aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2014-09-16 11:25:17 -0400
committerBill Meier <wmeier@newsguy.com>2014-09-16 15:31:58 +0000
commita379ac74d27a094cd89b0fc0f5196c46052f5a9f (patch)
tree662a038427bf7c82167703e4a3838a87dda0400b /epan
parentb14bf98c06dbf1324c63dee633a025d251391601 (diff)
Fix spelling: cant-->can't, wont-->won't, etc
Change-Id: Ia6c3e7a25615bf8e052c3bacf096d76df775c9c2 Reviewed-on: https://code.wireshark.org/review/4126 Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/conversation_table.c8
-rw-r--r--epan/dissectors/packet-kerberos.c4
-rw-r--r--epan/dissectors/packet-ldap.c10
-rw-r--r--epan/dissectors/packet-nbap.c2
-rw-r--r--epan/dissectors/packet-ros.c4
-rw-r--r--epan/dissectors/packet-rrc.c4
-rw-r--r--epan/dissectors/packet-spnego.c10
-rw-r--r--epan/dissectors/packet-x509af.c4
-rw-r--r--epan/emem.c2
-rw-r--r--epan/frame_data.c2
-rw-r--r--epan/proto.c4
-rw-r--r--epan/reassemble.c4
-rw-r--r--epan/req_resp_hdrs.c4
-rw-r--r--epan/to_str.c2
14 files changed, 32 insertions, 32 deletions
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)