aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--airpcap.h2
-rw-r--r--asn1/cmp/packet-cmp-template.c2
-rw-r--r--asn1/h225/packet-h225-template.c4
-rw-r--r--asn1/h450/packet-h450-template.c46
-rw-r--r--asn1/isdn-sup/packet-isdn-sup-template.c8
-rw-r--r--asn1/ldap/packet-ldap-template.c4
-rw-r--r--asn1/nbap/packet-nbap-template.c8
-rw-r--r--asn1/qsig/packet-qsig-template.c4
-rw-r--r--epan/dissectors/packet-2dparityfec.c2
-rw-r--r--epan/dissectors/packet-assa_r3.c2
-rw-r--r--epan/dissectors/packet-ber.c4
-rw-r--r--epan/dissectors/packet-bssap.c2
-rw-r--r--epan/dissectors/packet-cmp.c2
-rw-r--r--epan/dissectors/packet-dcom.c2
-rw-r--r--epan/dissectors/packet-h225.c4
-rw-r--r--epan/dissectors/packet-h450.c46
-rw-r--r--epan/dissectors/packet-homeplug-av.c2
-rw-r--r--epan/dissectors/packet-iec104.c34
-rw-r--r--epan/dissectors/packet-ieee80211-wlancap.c2
-rw-r--r--epan/dissectors/packet-infiniband.c2
-rw-r--r--epan/dissectors/packet-isdn-sup.c8
-rw-r--r--epan/dissectors/packet-kink.c18
-rw-r--r--epan/dissectors/packet-ldap.c4
-rw-r--r--epan/dissectors/packet-mgcp.c2
-rw-r--r--epan/dissectors/packet-mp2t.c2
-rw-r--r--epan/dissectors/packet-mysql.c4
-rw-r--r--epan/dissectors/packet-nbap.c8
-rw-r--r--epan/dissectors/packet-ndmp.c2
-rw-r--r--epan/dissectors/packet-netbios.c2
-rw-r--r--epan/dissectors/packet-nfs.c6
-rw-r--r--epan/dissectors/packet-ntlmssp.c4
-rw-r--r--epan/dissectors/packet-opensafety.c2
-rw-r--r--epan/dissectors/packet-ppi-vector.c2
-rw-r--r--epan/dissectors/packet-qsig.c4
-rw-r--r--epan/dissectors/packet-sbus.c2
-rw-r--r--epan/dissectors/packet-sccp.c2
-rw-r--r--epan/dissectors/packet-sctp.c4
-rw-r--r--epan/dissectors/packet-sip.c4
-rw-r--r--epan/dissectors/packet-skinny.c4
-rw-r--r--epan/dissectors/packet-slowprotocols.c2
-rw-r--r--epan/dissectors/packet-smtp.c2
-rw-r--r--epan/dissectors/packet-ssl.c4
-rw-r--r--epan/dissectors/packet-sua.c2
-rw-r--r--epan/dissectors/packet-tetra.c2
-rw-r--r--epan/dissectors/packet-umts_fp.c2
-rw-r--r--epan/dissectors/packet-umts_mac.h6
-rw-r--r--epan/dissectors/packet-v5ua.c2
-rw-r--r--epan/dissectors/packet-vssmonitoring.c2
-rw-r--r--epan/dissectors/packet-x11.c2
-rw-r--r--epan/filesystem.c2
-rw-r--r--epan/strutil.h6
-rw-r--r--epan/tcap-persistentdata.c8
-rw-r--r--epan/tvbuff.c4
-rw-r--r--epan/tvbuff.h4
-rw-r--r--epan/wmem/wmem_allocator_block.c4
-rw-r--r--epan/wslua/wslua_tvb.c8
-rw-r--r--file.h10
-rw-r--r--plugins/profinet/packet-dcerpc-pn-io.c2
-rw-r--r--ui/gtk/conversations_table.c2
-rw-r--r--ui/gtk/gui_utils.c4
-rw-r--r--ui/gtk/gui_utils.h20
-rw-r--r--ui/gtk/iax2_analysis.c2
-rw-r--r--ui/gtk/packet_list.c4
-rw-r--r--ui/gtk/prefs_column.c4
-rw-r--r--ui/gtk/rlc_lte_graph.c4
-rw-r--r--ui/gtk/rtp_player.c10
-rw-r--r--ui/gtk/voip_calls.c4
-rw-r--r--wiretap/csids.c2
-rw-r--r--wiretap/vms.c34
69 files changed, 215 insertions, 215 deletions
diff --git a/airpcap.h b/airpcap.h
index 657f6dd03b..a55fc5550f 100644
--- a/airpcap.h
+++ b/airpcap.h
@@ -627,7 +627,7 @@ gboolean AirpcapSetDriverDecryptionState(PAirpcapHandle AdapterHandle, AirpcapDe
\brief Tells if this open instance is configured to perform the decryption of the incoming frames with the <b>global driver</b> set of keys.
\param AdapterHandle Handle to the adapter.
\param PEnable Pointer to a user supplied variable that will contain the decryption configuration. See \ref PAirpcapDecryptionState for details.
- \return TRUE if the operation is succesful. FALSE otherwise.
+ \return TRUE if the operation is successful. FALSE otherwise.
The global decryption keys can be configured with the \ref AirpcapSetDriverKeys() function.
\note By default, the driver is configured with \ref AIRPCAP_DECRYPTION_ON.
diff --git a/asn1/cmp/packet-cmp-template.c b/asn1/cmp/packet-cmp-template.c
index 8a8f39ec52..be42981d41 100644
--- a/asn1/cmp/packet-cmp-template.c
+++ b/asn1/cmp/packet-cmp-template.c
@@ -252,7 +252,7 @@ dissect_cmp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void
}
/* arbitrary limit: assume a CMP over TCP pdu is never >10000 bytes
* in size.
- * It is definitely at least 1 byte to accomodate the flags byte
+ * It is definitely at least 1 byte to accommodate the flags byte
*/
if((pdu_len<=0)||(pdu_len>10000)){
return 0;
diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c
index 7c0c395d59..7fa03070a0 100644
--- a/asn1/h225/packet-h225-template.c
+++ b/asn1/h225/packet-h225-template.c
@@ -407,10 +407,10 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
{
/* if last request has been responded
and this request appears after last response (has bigger frame number)
- and last request occured more than 300 seconds ago,
+ and last request occurred more than 300 seconds ago,
or if last request hasn't been responded
and this request appears after last request (has bigger frame number)
- and last request occured more than 1800 seconds ago,
+ and last request occurred more than 1800 seconds ago,
we decide that we have a new request */
/* Append new ras call to list */
h225ras_call = append_h225ras_call(h225ras_call, pinfo, &pi->guid, msg_category);
diff --git a/asn1/h450/packet-h450-template.c b/asn1/h450/packet-h450-template.c
index d98a1e2d5b..f1ac186618 100644
--- a/asn1/h450/packet-h450-template.c
+++ b/asn1/h450/packet-h450-template.c
@@ -78,7 +78,7 @@ typedef struct _h450_op_t {
static const h450_op_t h450_op_tab[] = {
#include "packet-h450-table11.c"
-};
+};
typedef struct _h450_err_t {
gint32 errcode;
@@ -87,12 +87,12 @@ typedef struct _h450_err_t {
static const h450_err_t h450_err_tab[] = {
#include "packet-h450-table21.c"
-};
+};
static const h450_op_t *get_op(gint32 opcode) {
int i;
- /* search from the end to get the last occurence if the operation is redefined in some newer specification */
+ /* search from the end to get the last occurrence if the operation is redefined in some newer specification */
for (i = array_length(h450_op_tab) - 1; i >= 0; i--)
if (h450_op_tab[i].opcode == opcode)
return &h450_op_tab[i];
@@ -102,7 +102,7 @@ static const h450_op_t *get_op(gint32 opcode) {
static const h450_err_t *get_err(gint32 errcode) {
int i;
- /* search from the end to get the last occurence if the operation is redefined in some newer specification */
+ /* search from the end to get the last occurrence if the operation is redefined in some newer specification */
for (i = array_length(h450_err_tab) - 1; i >= 0; i--)
if (h450_err_tab[i].errcode == errcode)
return &h450_err_tab[i];
@@ -110,7 +110,7 @@ static const h450_err_t *get_err(gint32 errcode) {
}
/*--- dissect_h450_arg ------------------------------------------------------*/
-static int
+static int
dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) {
proto_item *hidden_item;
int offset;
@@ -123,13 +123,13 @@ dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
rctx = get_rose_ctx(pinfo->private_data);
DISSECTOR_ASSERT(rctx);
if (rctx->d.pdu != 1) /* invoke */
- return offset;
+ return offset;
if (rctx->d.code != 0) /* local */
- return offset;
+ return offset;
opcode = rctx->d.code_local;
op_ptr = get_op(opcode);
if (!op_ptr)
- return offset;
+ return offset;
hidden_item = proto_tree_add_uint(tree, hf_h450_operation, tvb, 0, 0, opcode);
PROTO_ITEM_SET_HIDDEN(hidden_item);
@@ -142,7 +142,7 @@ dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
if (op_ptr->arg_pdu && (tvb_length_remaining(tvb, offset) > 0))
offset = op_ptr->arg_pdu(tvb, pinfo, tree, NULL);
- else
+ else
if (tvb_length_remaining(tvb, offset) > 0) {
proto_tree_add_text(tree, tvb, offset, -1, "UNSUPPORTED ARGUMENT TYPE (H.450)");
offset += tvb_length_remaining(tvb, offset);
@@ -152,7 +152,7 @@ dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
}
/*--- dissect_h450_res ------------------------------------------------------*/
-static int
+static int
dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) {
proto_item *hidden_item;
int offset;
@@ -165,13 +165,13 @@ dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
rctx = get_rose_ctx(pinfo->private_data);
DISSECTOR_ASSERT(rctx);
if (rctx->d.pdu != 2) /* returnResult */
- return offset;
+ return offset;
if (rctx->d.code != 0) /* local */
- return offset;
+ return offset;
opcode = rctx->d.code_local;
op_ptr = get_op(opcode);
if (!op_ptr)
- return offset;
+ return offset;
hidden_item = proto_tree_add_uint(tree, hf_h450_operation, tvb, 0, 0, opcode);
PROTO_ITEM_SET_HIDDEN(hidden_item);
@@ -184,7 +184,7 @@ dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
if (op_ptr->res_pdu && (tvb_length_remaining(tvb, offset) > 0))
offset = op_ptr->res_pdu(tvb, pinfo, tree, NULL);
- else
+ else
if (tvb_length_remaining(tvb, offset) > 0) {
proto_tree_add_text(tree, tvb, offset, -1, "UNSUPPORTED RESULT TYPE (H.450)");
offset += tvb_length_remaining(tvb, offset);
@@ -194,7 +194,7 @@ dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
}
/*--- dissect_h450_err ------------------------------------------------------*/
-static int
+static int
dissect_h450_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) {
proto_item *hidden_item;
int offset;
@@ -207,13 +207,13 @@ dissect_h450_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
rctx = get_rose_ctx(pinfo->private_data);
DISSECTOR_ASSERT(rctx);
if (rctx->d.pdu != 3) /* returnError */
- return offset;
+ return offset;
if (rctx->d.code != 0) /* local */
- return offset;
+ return offset;
errcode = rctx->d.code_local;
err_ptr = get_err(errcode);
if (!err_ptr)
- return offset;
+ return offset;
hidden_item = proto_tree_add_uint(tree, hf_h450_error, tvb, 0, 0, errcode);
PROTO_ITEM_SET_HIDDEN(hidden_item);
@@ -226,7 +226,7 @@ dissect_h450_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
if (err_ptr->err_pdu && (tvb_length_remaining(tvb, offset) > 0))
offset = err_ptr->err_pdu(tvb, pinfo, tree, NULL);
- else
+ else
if (tvb_length_remaining(tvb, offset) > 0) {
proto_tree_add_text(tree, tvb, offset, -1, "UNSUPPORTED ERROR TYPE (H.450)");
offset += tvb_length_remaining(tvb, offset);
@@ -261,16 +261,16 @@ void proto_register_h450(void) {
/* Register fields and subtrees */
proto_register_field_array(proto_h450, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
-
+
rose_ctx_init(&h450_rose_ctx);
/* Register dissector tables */
h450_rose_ctx.arg_global_dissector_table = register_dissector_table("h450.ros.global.arg", "H.450 Operation Argument (global opcode)", FT_STRING, BASE_NONE);
h450_rose_ctx.res_global_dissector_table = register_dissector_table("h450.ros.global.res", "H.450 Operation Result (global opcode)", FT_STRING, BASE_NONE);
- h450_rose_ctx.arg_local_dissector_table = register_dissector_table("h450.ros.local.arg", "H.450 Operation Argument (local opcode)", FT_UINT32, BASE_HEX);
- h450_rose_ctx.res_local_dissector_table = register_dissector_table("h450.ros.local.res", "H.450 Operation Result (local opcode)", FT_UINT32, BASE_HEX);
+ h450_rose_ctx.arg_local_dissector_table = register_dissector_table("h450.ros.local.arg", "H.450 Operation Argument (local opcode)", FT_UINT32, BASE_HEX);
+ h450_rose_ctx.res_local_dissector_table = register_dissector_table("h450.ros.local.res", "H.450 Operation Result (local opcode)", FT_UINT32, BASE_HEX);
h450_rose_ctx.err_global_dissector_table = register_dissector_table("h450.ros.global.err", "H.450 Error (global opcode)", FT_STRING, BASE_NONE);
- h450_rose_ctx.err_local_dissector_table = register_dissector_table("h450.ros.local.err", "H.450 Error (local opcode)", FT_UINT32, BASE_HEX);
+ h450_rose_ctx.err_local_dissector_table = register_dissector_table("h450.ros.local.err", "H.450 Error (local opcode)", FT_UINT32, BASE_HEX);
}
diff --git a/asn1/isdn-sup/packet-isdn-sup-template.c b/asn1/isdn-sup/packet-isdn-sup-template.c
index b9eecc6841..6971c5f029 100644
--- a/asn1/isdn-sup/packet-isdn-sup-template.c
+++ b/asn1/isdn-sup/packet-isdn-sup-template.c
@@ -1,5 +1,5 @@
/* packet-isdn-sup-template.c
- * Routines for ETSI Integrated Services Digital Network (ISDN)
+ * Routines for ETSI Integrated Services Digital Network (ISDN)
* supplementary services
* Copyright 2013, Anders Broman <anders.broman@ericsson.com>
*
@@ -104,7 +104,7 @@ static const isdn_sup_err_t isdn_sup_err_tab[] = {
static const isdn_sup_op_t *get_op(gint32 opcode) {
int i;
- /* search from the end to get the last occurence if the operation is redefined in some newer specification */
+ /* search from the end to get the last occurrence if the operation is redefined in some newer specification */
for (i = array_length(isdn_sup_op_tab) - 1; i >= 0; i--)
if (isdn_sup_op_tab[i].opcode == opcode)
return &isdn_sup_op_tab[i];
@@ -114,7 +114,7 @@ static const isdn_sup_op_t *get_op(gint32 opcode) {
static const isdn_sup_err_t *get_err(gint32 errcode) {
int i;
- /* search from the end to get the last occurence if the operation is redefined in some newer specification */
+ /* search from the end to get the last occurrence if the operation is redefined in some newer specification */
for (i = array_length(isdn_sup_err_tab) - 1; i >= 0; i--)
if (isdn_sup_err_tab[i].errcode == errcode)
return &isdn_sup_err_tab[i];
@@ -303,7 +303,7 @@ void proto_register_isdn_sup(void) {
FT_INT32, BASE_DEC, NULL, 0,
NULL, HFILL }
},
- { &hf_isdn_sup_operation,
+ { &hf_isdn_sup_operation,
{ "Operation", "isdn_sup.operation",
FT_UINT8, BASE_DEC, VALS(isdn_sup_str_operation), 0x0,
NULL, HFILL }
diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c
index faf8b8d4f3..328ffbbdbc 100644
--- a/asn1/ldap/packet-ldap-template.c
+++ b/asn1/ldap/packet-ldap-template.c
@@ -29,7 +29,7 @@
* it handles only the commands of version 2, but any additional characteristics of the ver3 command are supported.
* It's also missing extensible search filters.
*
- * There should probably be alot more error checking, I simply assume that if we have a full packet, it will be a complete
+ * There should probably be a lot more error checking, I simply assume that if we have a full packet, it will be a complete
* and correct packet.
*
* AFAIK, it will handle all messages used by the OpenLDAP 1.2.9 server and libraries which was my goal. I do plan to add
@@ -2250,7 +2250,7 @@ void proto_register_ldap(void) {
module_t *ldap_module;
uat_t *attributes_uat;
-
+
/* Register protocol */
proto_ldap = proto_register_protocol(PNAME, PSNAME, PFNAME);
/* Register fields and subtrees */
diff --git a/asn1/nbap/packet-nbap-template.c b/asn1/nbap/packet-nbap-template.c
index d7aecea362..78cb6778cc 100644
--- a/asn1/nbap/packet-nbap-template.c
+++ b/asn1/nbap/packet-nbap-template.c
@@ -352,7 +352,7 @@ static void add_hsdsch_bind(packet_info *pinfo, proto_tree * tree){
return;
}
- /* Set port to zero use that as an indication of wether we have data or not */
+ /* Set port to zero use that as an indication of whether we have data or not */
SET_ADDRESS(&null_addr, AT_NONE, 0, NULL);
for (i = 0; i < maxNrOfMACdFlows; i++) {
if (nbap_hsdsch_channel_info[i].crnc_port != 0){
@@ -429,14 +429,14 @@ static void nbap_init(void){
NULL, /* data pointer, optional */
NULL, /* function to free the memory allocated for the key used when removing the entry */
g_free);
-
-
+
+
/*Initialize structure for muxed flow indication*/
edch_flow_port_map = g_tree_new_full(nbap_key_cmp,
NULL, /* data pointer, optional */
NULL, /* function to free the memory allocated for the key used when removing the entry */
g_free);
-
+
for (i = 0; i < 15; i++) {
lchId_type_table[i+1] = *lch_contents[i];
}
diff --git a/asn1/qsig/packet-qsig-template.c b/asn1/qsig/packet-qsig-template.c
index a2328d5a69..583a7977e4 100644
--- a/asn1/qsig/packet-qsig-template.c
+++ b/asn1/qsig/packet-qsig-template.c
@@ -344,7 +344,7 @@ static const qsig_err_t qsig_err_tab[] = {
static const qsig_op_t *get_op(gint32 opcode) {
int i;
- /* search from the end to get the last occurence if the operation is redefined in some newer specification */
+ /* search from the end to get the last occurrence if the operation is redefined in some newer specification */
for (i = array_length(qsig_op_tab) - 1; i >= 0; i--)
if (qsig_op_tab[i].opcode == opcode)
return &qsig_op_tab[i];
@@ -360,7 +360,7 @@ static gint32 get_service(gint32 opcode) {
static const qsig_err_t *get_err(gint32 errcode) {
int i;
- /* search from the end to get the last occurence if the operation is redefined in some newer specification */
+ /* search from the end to get the last occurrence if the operation is redefined in some newer specification */
for (i = array_length(qsig_err_tab) - 1; i >= 0; i--)
if (qsig_err_tab[i].errcode == errcode)
return &qsig_err_tab[i];
diff --git a/epan/dissectors/packet-2dparityfec.c b/epan/dissectors/packet-2dparityfec.c
index 881bec748a..99934d1443 100644
--- a/epan/dissectors/packet-2dparityfec.c
+++ b/epan/dissectors/packet-2dparityfec.c
@@ -54,7 +54,7 @@
** type 96 is dynamic and may refer to other protocols. As Pro-MPEG FEC must
** function in the absence of a control channel, and because this data is
** likely to be transmitted within closed networks, no automatic mechanism
-** exists for specifying the existance of Pro-MPEG FEC on payload type 96.
+** exists for specifying the existence of Pro-MPEG FEC on payload type 96.
** This dissector is thus disabled by default. Dissection of this protocol
** may be enabled from the 2dparityfec panel under Preferences->Protocols.
**
diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c
index 69a3b57d2f..c7730c480c 100644
--- a/epan/dissectors/packet-assa_r3.c
+++ b/epan/dissectors/packet-assa_r3.c
@@ -511,7 +511,7 @@ typedef enum
EVENT_PANICACTIVE, /* 48 - Access denied because lock is in panic mode */
EVENT_PASSAGEACTIVE, /* 49 - Access denied because lock is in passage mode */
EVENT_PASSAGEINACTIVE, /* 50 - Access denied because lock is not in passage mode */
- EVENT_BADACCESSMODE, /* 51 - Access denied because access mode is wierd */
+ EVENT_BADACCESSMODE, /* 51 - Access denied because access mode is weird */
EVENT_CLOCKERR, /* 52 - Error reading RTC */
EVENT_REMOTEUNLOCK, /* 53 - Remote unlock */
EVENT_TZHAUDISABLED, /* 54 - Time zone, exceptions, and auto-unlock functionality disabled */
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index 9640d94577..996edac40a 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -4044,7 +4044,7 @@ printf("SQ OF dissect_ber_sq_of(%s) entered\n", name);
}
}
} else {
- /* the tvb length should be correct now nope we could be comming from an implicit choice or sequence, thus we
+ /* the tvb length should be correct now nope we could be coming from an implicit choice or sequence, thus we
read the items we match and return the length*/
lenx = tvb_length_remaining(tvb, offset);
end_offset = offset + lenx;
@@ -4281,7 +4281,7 @@ printf("SQ OF dissect_ber_old_sq_of(%s) entered\n", name);
}
}
} else {
- /* the tvb length should be correct now nope we could be comming from an implicit choice or sequence, thus we
+ /* the tvb length should be correct now nope we could be coming from an implicit choice or sequence, thus we
read the items we match and return the length*/
lenx = tvb_length_remaining(tvb, offset);
end_offset = offset + lenx;
diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c
index 62a2a1c2ab..3932340101 100644
--- a/epan/dissectors/packet-bssap.c
+++ b/epan/dissectors/packet-bssap.c
@@ -429,7 +429,7 @@ dissect_bssap_data_param(tvbuff_t *tvb, packet_info *pinfo,
}
}
- /* No sub-dissection occured, treat it as raw data */
+ /* No sub-dissection occurred, treat it as raw data */
call_dissector(data_handle, tvb, pinfo, bssap_tree);
}
diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c
index 499af91638..bab7b14990 100644
--- a/epan/dissectors/packet-cmp.c
+++ b/epan/dissectors/packet-cmp.c
@@ -1634,7 +1634,7 @@ dissect_cmp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void
}
/* arbitrary limit: assume a CMP over TCP pdu is never >10000 bytes
* in size.
- * It is definitely at least 1 byte to accomodate the flags byte
+ * It is definitely at least 1 byte to accommodate the flags byte
*/
if((pdu_len<=0)||(pdu_len>10000)){
return 0;
diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c
index 6f27e9b2d0..8f9756b6ee 100644
--- a/epan/dissectors/packet-dcom.c
+++ b/epan/dissectors/packet-dcom.c
@@ -1066,7 +1066,7 @@ dissect_dcom_HRESULT_item(tvbuff_t *tvb, int offset, packet_info *pinfo,
}
-/* dissect hresult field of a usual DCOM call (seperate method, because often used) */
+/* dissect hresult field of a usual DCOM call (separate method, because often used) */
int
dissect_dcom_HRESULT(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, guint8 *drep,
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index c5cc0db24b..a97ac56584 100644
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -11141,10 +11141,10 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
{
/* if last request has been responded
and this request appears after last response (has bigger frame number)
- and last request occured more than 300 seconds ago,
+ and last request occurred more than 300 seconds ago,
or if last request hasn't been responded
and this request appears after last request (has bigger frame number)
- and last request occured more than 1800 seconds ago,
+ and last request occurred more than 1800 seconds ago,
we decide that we have a new request */
/* Append new ras call to list */
h225ras_call = append_h225ras_call(h225ras_call, pinfo, &pi->guid, msg_category);
diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c
index 7923a9eaa0..f3818e2fe8 100644
--- a/epan/dissectors/packet-h450.c
+++ b/epan/dissectors/packet-h450.c
@@ -4589,7 +4589,7 @@ static const h450_op_t h450_op_tab[] = {
/*--- End of included file: packet-h450-table11.c ---*/
#line 81 "../../asn1/h450/packet-h450-template.c"
-};
+};
typedef struct _h450_err_t {
gint32 errcode;
@@ -4681,12 +4681,12 @@ static const h450_err_t h450_err_tab[] = {
/*--- End of included file: packet-h450-table21.c ---*/
#line 90 "../../asn1/h450/packet-h450-template.c"
-};
+};
static const h450_op_t *get_op(gint32 opcode) {
int i;
- /* search from the end to get the last occurence if the operation is redefined in some newer specification */
+ /* search from the end to get the last occurrence if the operation is redefined in some newer specification */
for (i = array_length(h450_op_tab) - 1; i >= 0; i--)
if (h450_op_tab[i].opcode == opcode)
return &h450_op_tab[i];
@@ -4696,7 +4696,7 @@ static const h450_op_t *get_op(gint32 opcode) {
static const h450_err_t *get_err(gint32 errcode) {
int i;
- /* search from the end to get the last occurence if the operation is redefined in some newer specification */
+ /* search from the end to get the last occurrence if the operation is redefined in some newer specification */
for (i = array_length(h450_err_tab) - 1; i >= 0; i--)
if (h450_err_tab[i].errcode == errcode)
return &h450_err_tab[i];
@@ -4704,7 +4704,7 @@ static const h450_err_t *get_err(gint32 errcode) {
}
/*--- dissect_h450_arg ------------------------------------------------------*/
-static int
+static int
dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) {
proto_item *hidden_item;
int offset;
@@ -4717,13 +4717,13 @@ dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
rctx = get_rose_ctx(pinfo->private_data);
DISSECTOR_ASSERT(rctx);
if (rctx->d.pdu != 1) /* invoke */
- return offset;
+ return offset;
if (rctx->d.code != 0) /* local */
- return offset;
+ return offset;
opcode = rctx->d.code_local;
op_ptr = get_op(opcode);
if (!op_ptr)
- return offset;
+ return offset;
hidden_item = proto_tree_add_uint(tree, hf_h450_operation, tvb, 0, 0, opcode);
PROTO_ITEM_SET_HIDDEN(hidden_item);
@@ -4736,7 +4736,7 @@ dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
if (op_ptr->arg_pdu && (tvb_length_remaining(tvb, offset) > 0))
offset = op_ptr->arg_pdu(tvb, pinfo, tree, NULL);
- else
+ else
if (tvb_length_remaining(tvb, offset) > 0) {
proto_tree_add_text(tree, tvb, offset, -1, "UNSUPPORTED ARGUMENT TYPE (H.450)");
offset += tvb_length_remaining(tvb, offset);
@@ -4746,7 +4746,7 @@ dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
}
/*--- dissect_h450_res ------------------------------------------------------*/
-static int
+static int
dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) {
proto_item *hidden_item;
int offset;
@@ -4759,13 +4759,13 @@ dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
rctx = get_rose_ctx(pinfo->private_data);
DISSECTOR_ASSERT(rctx);
if (rctx->d.pdu != 2) /* returnResult */
- return offset;
+ return offset;
if (rctx->d.code != 0) /* local */
- return offset;
+ return offset;
opcode = rctx->d.code_local;
op_ptr = get_op(opcode);
if (!op_ptr)
- return offset;
+ return offset;
hidden_item = proto_tree_add_uint(tree, hf_h450_operation, tvb, 0, 0, opcode);
PROTO_ITEM_SET_HIDDEN(hidden_item);
@@ -4778,7 +4778,7 @@ dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
if (op_ptr->res_pdu && (tvb_length_remaining(tvb, offset) > 0))
offset = op_ptr->res_pdu(tvb, pinfo, tree, NULL);
- else
+ else
if (tvb_length_remaining(tvb, offset) > 0) {
proto_tree_add_text(tree, tvb, offset, -1, "UNSUPPORTED RESULT TYPE (H.450)");
offset += tvb_length_remaining(tvb, offset);
@@ -4788,7 +4788,7 @@ dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
}
/*--- dissect_h450_err ------------------------------------------------------*/
-static int
+static int
dissect_h450_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) {
proto_item *hidden_item;
int offset;
@@ -4801,13 +4801,13 @@ dissect_h450_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
rctx = get_rose_ctx(pinfo->private_data);
DISSECTOR_ASSERT(rctx);
if (rctx->d.pdu != 3) /* returnError */
- return offset;
+ return offset;
if (rctx->d.code != 0) /* local */
- return offset;
+ return offset;
errcode = rctx->d.code_local;
err_ptr = get_err(errcode);
if (!err_ptr)
- return offset;
+ return offset;
hidden_item = proto_tree_add_uint(tree, hf_h450_error, tvb, 0, 0, errcode);
PROTO_ITEM_SET_HIDDEN(hidden_item);
@@ -4820,7 +4820,7 @@ dissect_h450_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
if (err_ptr->err_pdu && (tvb_length_remaining(tvb, offset) > 0))
offset = err_ptr->err_pdu(tvb, pinfo, tree, NULL);
- else
+ else
if (tvb_length_remaining(tvb, offset) > 0) {
proto_tree_add_text(tree, tvb, offset, -1, "UNSUPPORTED ERROR TYPE (H.450)");
offset += tvb_length_remaining(tvb, offset);
@@ -6463,16 +6463,16 @@ void proto_register_h450(void) {
/* Register fields and subtrees */
proto_register_field_array(proto_h450, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
-
+
rose_ctx_init(&h450_rose_ctx);
/* Register dissector tables */
h450_rose_ctx.arg_global_dissector_table = register_dissector_table("h450.ros.global.arg", "H.450 Operation Argument (global opcode)", FT_STRING, BASE_NONE);
h450_rose_ctx.res_global_dissector_table = register_dissector_table("h450.ros.global.res", "H.450 Operation Result (global opcode)", FT_STRING, BASE_NONE);
- h450_rose_ctx.arg_local_dissector_table = register_dissector_table("h450.ros.local.arg", "H.450 Operation Argument (local opcode)", FT_UINT32, BASE_HEX);
- h450_rose_ctx.res_local_dissector_table = register_dissector_table("h450.ros.local.res", "H.450 Operation Result (local opcode)", FT_UINT32, BASE_HEX);
+ h450_rose_ctx.arg_local_dissector_table = register_dissector_table("h450.ros.local.arg", "H.450 Operation Argument (local opcode)", FT_UINT32, BASE_HEX);
+ h450_rose_ctx.res_local_dissector_table = register_dissector_table("h450.ros.local.res", "H.450 Operation Result (local opcode)", FT_UINT32, BASE_HEX);
h450_rose_ctx.err_global_dissector_table = register_dissector_table("h450.ros.global.err", "H.450 Error (global opcode)", FT_STRING, BASE_NONE);
- h450_rose_ctx.err_local_dissector_table = register_dissector_table("h450.ros.local.err", "H.450 Error (local opcode)", FT_UINT32, BASE_HEX);
+ h450_rose_ctx.err_local_dissector_table = register_dissector_table("h450.ros.local.err", "H.450 Error (local opcode)", FT_UINT32, BASE_HEX);
}
diff --git a/epan/dissectors/packet-homeplug-av.c b/epan/dissectors/packet-homeplug-av.c
index 7024ed4296..aecdb3f7af 100644
--- a/epan/dissectors/packet-homeplug-av.c
+++ b/epan/dissectors/packet-homeplug-av.c
@@ -942,7 +942,7 @@ static const value_string homeplug_av_wr_rd_mod_cnf_status_vals[] = {
static const value_string homeplug_av_wr_mod_ind_status_vals[] = {
{ 0x00, "Successful module update" },
- { 0x10, "Update occured but not successful" },
+ { 0x10, "Update occurred but not successful" },
{ 0, NULL }
};
diff --git a/epan/dissectors/packet-iec104.c b/epan/dissectors/packet-iec104.c
index 16442cc10d..ab04a742d2 100644
--- a/epan/dissectors/packet-iec104.c
+++ b/epan/dissectors/packet-iec104.c
@@ -108,7 +108,7 @@ typedef struct {
/* quality descriptor-bits */
gboolean BL; /* Blocked (1) */
gboolean SB; /* Substituted (1) */
- gboolean NT; /* Topical (0) / Not topical (1) [Topical <=> if most recent update was succesful] */
+ gboolean NT; /* Topical (0) / Not topical (1) [Topical <=> if most recent update was successful] */
gboolean IV; /* Invalid (1) */
/* from separat quality descriptor */
gboolean OV; /* Overflow (1) */
@@ -563,11 +563,11 @@ static void get_SIQ( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_t
value->ON = siq & 0x01;
value->OFF = !(value->ON);
- value->BL = siq & 0x10; /* Blocked (1) */
- value->SB = siq & 0x20; /* Substituted (1) */
- value->NT = siq & 0x40; /* Topical (0) / Not topical (1) */
- /* [Topical <=> if most recent update was succesful] */
- value->IV = siq & 0x80; /* Invalid (1) */
+ value->BL = siq & 0x10; /* Blocked (1) */
+ value->SB = siq & 0x20; /* Substituted (1) */
+ value->NT = siq & 0x40; /* Topical (0) / Not topical (1) */
+ /* [Topical <=> if most recent update was successful] */
+ value->IV = siq & 0x80; /* Invalid (1) */
if( iec104_header_tree != NULL )
{
proto_tree_add_text( iec104_header_tree, tvb, *offset, 1, "Value: %s - Status: %s, %s, %s, %s",
@@ -610,11 +610,11 @@ static void get_DIQ( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_t
default:
break;
}
- value->BL = diq & 0x10; /* Blocked (1) */
- value->SB = diq & 0x20; /* Substituted (1) */
- value->NT = diq & 0x40; /* Topical (0) / Not topical (1) */
- /* [Topical <=> if most recent update was succesful] */
- value->IV = diq & 0x80; /* Invalid (1) */
+ value->BL = diq & 0x10; /* Blocked (1) */
+ value->SB = diq & 0x20; /* Substituted (1) */
+ value->NT = diq & 0x40; /* Topical (0) / Not topical (1) */
+ /* [Topical <=> if most recent update was successful] */
+ value->IV = diq & 0x80; /* Invalid (1) */
if( iec104_header_tree != NULL )
{
@@ -637,12 +637,12 @@ static void get_QDS( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_t
/* -------- QDS quality description */
qds = tvb_get_guint8(tvb, *offset);
- value->OV = qds & 0x01; /* Overflow (1) */
- value->BL = qds & 0x10; /* Blocked (1) */
- value->SB = qds & 0x20; /* Substituted (1) */
- value->NT = qds & 0x40; /* Topical (0) / Not topical (1) */
- /* [Topical <=> if most recent update was succesful] */
- value->IV = qds & 0x80; /* Invalid (1) */
+ value->OV = qds & 0x01; /* Overflow (1) */
+ value->BL = qds & 0x10; /* Blocked (1) */
+ value->SB = qds & 0x20; /* Substituted (1) */
+ value->NT = qds & 0x40; /* Topical (0) / Not topical (1) */
+ /* [Topical <=> if most recent update was successful] */
+ value->IV = qds & 0x80; /* Invalid (1) */
if( iec104_header_tree != NULL )
{
proto_tree_add_text( iec104_header_tree, tvb, *offset, 1, "Status: %s, %s, %s, %s, %s",
diff --git a/epan/dissectors/packet-ieee80211-wlancap.c b/epan/dissectors/packet-ieee80211-wlancap.c
index c641fc246b..f00c1433a5 100644
--- a/epan/dissectors/packet-ieee80211-wlancap.c
+++ b/epan/dissectors/packet-ieee80211-wlancap.c
@@ -303,7 +303,7 @@ packets are lost due to unreliable transport, rather than a frame never
being received to begin with.
4.15 drops
-This is a counter of the number of known frame drops that occured. This
+This is a counter of the number of known frame drops that occurred. This
is particularly useful when the system or hardware cannot keep up with
the sniffer load.
diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c
index 074528822a..560f405b53 100644
--- a/epan/dissectors/packet-infiniband.c
+++ b/epan/dissectors/packet-infiniband.c
@@ -7298,7 +7298,7 @@ void proto_register_infiniband(void)
{ &hf_infiniband_PortCounters_ExcessiveBufferOverrunErrors, {
"ExcessiveBufferOverrunErrors", "infiniband.portcounters.excessivebufferoverrunerrors",
FT_UINT8, BASE_DEC, NULL, 0x0,
- "The number of times that OverrunErrors consecutive flow control update periods occured",
+ "The number of times that OverrunErrors consecutive flow control update periods occurred",
HFILL}
},
{ &hf_infiniband_PortCounters_VL15Dropped, {
diff --git a/epan/dissectors/packet-isdn-sup.c b/epan/dissectors/packet-isdn-sup.c
index d401c75a0a..3a93aa49d8 100644
--- a/epan/dissectors/packet-isdn-sup.c
+++ b/epan/dissectors/packet-isdn-sup.c
@@ -7,7 +7,7 @@
#line 1 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
/* packet-isdn-sup-template.c
- * Routines for ETSI Integrated Services Digital Network (ISDN)
+ * Routines for ETSI Integrated Services Digital Network (ISDN)
* supplementary services
* Copyright 2013, Anders Broman <anders.broman@ericsson.com>
*
@@ -2451,7 +2451,7 @@ static const isdn_sup_err_t isdn_sup_err_tab[] = {
static const isdn_sup_op_t *get_op(gint32 opcode) {
int i;
- /* search from the end to get the last occurence if the operation is redefined in some newer specification */
+ /* search from the end to get the last occurrence if the operation is redefined in some newer specification */
for (i = array_length(isdn_sup_op_tab) - 1; i >= 0; i--)
if (isdn_sup_op_tab[i].opcode == opcode)
return &isdn_sup_op_tab[i];
@@ -2461,7 +2461,7 @@ static const isdn_sup_op_t *get_op(gint32 opcode) {
static const isdn_sup_err_t *get_err(gint32 errcode) {
int i;
- /* search from the end to get the last occurence if the operation is redefined in some newer specification */
+ /* search from the end to get the last occurrence if the operation is redefined in some newer specification */
for (i = array_length(isdn_sup_err_tab) - 1; i >= 0; i--)
if (isdn_sup_err_tab[i].errcode == errcode)
return &isdn_sup_err_tab[i];
@@ -2650,7 +2650,7 @@ void proto_register_isdn_sup(void) {
FT_INT32, BASE_DEC, NULL, 0,
NULL, HFILL }
},
- { &hf_isdn_sup_operation,
+ { &hf_isdn_sup_operation,
{ "Operation", "isdn_sup.operation",
FT_UINT8, BASE_DEC, VALS(isdn_sup_str_operation), 0x0,
NULL, HFILL }
diff --git a/epan/dissectors/packet-kink.c b/epan/dissectors/packet-kink.c
index fbedf1d347..73d4908563 100644
--- a/epan/dissectors/packet-kink.c
+++ b/epan/dissectors/packet-kink.c
@@ -325,7 +325,7 @@ dissect_payload_kink_ap_req(packet_info *pinfo, tvbuff_t *tvb, int offset, proto
guint payload_length;
guint16 krb_ap_req_length;
time_t timer; /* For showing utc */
- int start_payload_offset = 0; /* Keep begining of payload offset */
+ int start_payload_offset = 0; /* Keep beginning of payload offset */
start_payload_offset = offset;
payload_length = tvb_get_ntohs(tvb, offset + TO_PAYLOAD_LENGTH);
@@ -387,7 +387,7 @@ dissect_payload_kink_ap_rep(packet_info *pinfo, tvbuff_t *tvb, int offset, proto
guint payload_length;
guint16 krb_ap_rep_length;
time_t timer;
- int start_payload_offset = 0; /* Keep begining of payload offset */
+ int start_payload_offset = 0; /* Keep beginning of payload offset */
payload_length = tvb_get_ntohs(tvb, offset + TO_PAYLOAD_LENGTH);
start_payload_offset = offset;
@@ -448,7 +448,7 @@ dissect_payload_kink_krb_error(packet_info *pinfo, tvbuff_t *tvb, int offset, pr
guint8 reserved;
guint payload_length;
guint16 krb_error_length;
- int start_payload_offset = 0; /* Keep the begining of the payload offset */
+ int start_payload_offset = 0; /* Keep the beginning of the payload offset */
payload_length = tvb_get_ntohs(tvb, offset + TO_PAYLOAD_LENGTH);
start_payload_offset = offset;
@@ -502,7 +502,7 @@ dissect_payload_kink_tgt_req(packet_info *pinfo, tvbuff_t *tvb, int offset, prot
guint8 reserved;
guint payload_length;
guint16 realm_name_length;
- int start_payload_offset = 0; /* Keep the begining of the payload offset */
+ int start_payload_offset = 0; /* Keep the beginning of the payload offset */
payload_length = tvb_get_ntohs(tvb, offset + TO_PAYLOAD_LENGTH);
realm_name_length = tvb_get_ntohs(tvb, offset + TO_REALM_NAME_LENGTH);
@@ -549,7 +549,7 @@ dissect_payload_kink_tgt_rep(packet_info *pinfo, tvbuff_t *tvb, int offset, prot
guint payload_length;
guint princ_name_length;
guint16 tgt_length;
- int start_payload_offset = 0; /* Keep the begining of the payload offset */
+ int start_payload_offset = 0; /* Keep the beginning of the payload offset */
payload_length = tvb_get_ntohs(tvb, offset + TO_PAYLOAD_LENGTH);
start_payload_offset = offset;
@@ -613,7 +613,7 @@ dissect_payload_kink_isakmp(packet_info *pinfo, tvbuff_t *tvb, int offset, proto
guint8 inner_next_pload;
guint8 qm, qmmaj, qmmin;
guint16 reserved2;
- int start_payload_offset = 0; /* Keep the begining of the payload offset */
+ int start_payload_offset = 0; /* Keep the beginning of the payload offset */
tvbuff_t *isakmp_tvb;
payload_length = tvb_get_ntohs(tvb, offset + TO_PAYLOAD_LENGTH);
@@ -695,7 +695,7 @@ dissect_payload_kink_encrypt(packet_info *pinfo, tvbuff_t *tvb, int offset, prot
guint8 inner_next_pload;
guint32 reserved2;
guint16 inner_payload_length;
- int start_payload_offset = 0; /* Keep the begining of the payload offset */
+ int start_payload_offset = 0; /* Keep the beginning of the payload offset */
payload_length = tvb_get_ntohs(tvb,offset + TO_PAYLOAD_LENGTH);
start_payload_offset = offset;
@@ -800,7 +800,7 @@ dissect_payload_kink_error(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_
guint8 reserved;
guint16 payload_length;
guint32 error_code;
- int start_payload_offset = 0; /* Keep the begining of the payload offset */
+ int start_payload_offset = 0; /* Keep the beginning of the payload offset */
const char *char_error_code[] = {
"KINK_OK",
"KINK_PROTOERR",
@@ -872,7 +872,7 @@ dissect_payload_kink_not_defined(packet_info *pinfo, tvbuff_t *tvb, int offset,
guint8 next_payload;
guint payload_length;
guint8 reserved;
- int start_payload_offset = 0; /* Keep the begining of the payload offset */
+ int start_payload_offset = 0; /* Keep the beginning of the payload offset */
start_payload_offset = offset;
payload_length = tvb_get_ntohs(tvb, offset + TO_PAYLOAD_LENGTH);
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index afb6954584..cc74c633ab 100644
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -37,7 +37,7 @@
* it handles only the commands of version 2, but any additional characteristics of the ver3 command are supported.
* It's also missing extensible search filters.
*
- * There should probably be alot more error checking, I simply assume that if we have a full packet, it will be a complete
+ * There should probably be a lot more error checking, I simply assume that if we have a full packet, it will be a complete
* and correct packet.
*
* AFAIK, it will handle all messages used by the OpenLDAP 1.2.9 server and libraries which was my goal. I do plan to add
@@ -5856,7 +5856,7 @@ void proto_register_ldap(void) {
module_t *ldap_module;
uat_t *attributes_uat;
-
+
/* Register protocol */
proto_ldap = proto_register_protocol(PNAME, PSNAME, PFNAME);
/* Register fields and subtrees */
diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c
index 3efe6407f2..e048c1d403 100644
--- a/epan/dissectors/packet-mgcp.c
+++ b/epan/dissectors/packet-mgcp.c
@@ -2137,7 +2137,7 @@ static gint tvb_find_null_line(tvbuff_t* tvb, gint offset, gint len, gint* next_
maxoffset = (tvb_current_len - 1) + offset;
- /* Loop around until we either find a line begining with a carriage return
+ /* Loop around until we either find a line beginning with a carriage return
or newline character or until we hit the end of the tvbuff. */
do
{
diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c
index 6578624e09..57af258c4d 100644
--- a/epan/dissectors/packet-mp2t.c
+++ b/epan/dissectors/packet-mp2t.c
@@ -688,7 +688,7 @@ mp2t_process_fragmented_payload(tvbuff_t *tvb, gint offset, guint remaining_len,
}
- /* The begining of a new packet is present */
+ /* The beginning of a new packet is present */
if (pusi_flag) {
if (pointer > remaining_len) {
diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c
index 97f8ca2b26..fb52d75360 100644
--- a/epan/dissectors/packet-mysql.c
+++ b/epan/dissectors/packet-mysql.c
@@ -699,10 +699,10 @@ dissect_mysql_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
#endif
struct mysql_frame_data *mysql_frame_data_p;
- /* get conversation, create if neccessary*/
+ /* get conversation, create if necessary*/
conversation= find_or_create_conversation(pinfo);
- /* get associated state information, create if neccessary */
+ /* get associated state information, create if necessary */
conn_data= conversation_get_proto_data(conversation, proto_mysql);
if (!conn_data) {
conn_data= se_alloc(sizeof(mysql_conn_data_t));
diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c
index 7fd53c7ed9..ee69e998d3 100644
--- a/epan/dissectors/packet-nbap.c
+++ b/epan/dissectors/packet-nbap.c
@@ -55192,7 +55192,7 @@ static void add_hsdsch_bind(packet_info *pinfo, proto_tree * tree){
return;
}
- /* Set port to zero use that as an indication of wether we have data or not */
+ /* Set port to zero use that as an indication of whether we have data or not */
SET_ADDRESS(&null_addr, AT_NONE, 0, NULL);
for (i = 0; i < maxNrOfMACdFlows; i++) {
if (nbap_hsdsch_channel_info[i].crnc_port != 0){
@@ -55269,14 +55269,14 @@ static void nbap_init(void){
NULL, /* data pointer, optional */
NULL, /* function to free the memory allocated for the key used when removing the entry */
g_free);
-
-
+
+
/*Initialize structure for muxed flow indication*/
edch_flow_port_map = g_tree_new_full(nbap_key_cmp,
NULL, /* data pointer, optional */
NULL, /* function to free the memory allocated for the key used when removing the entry */
g_free);
-
+
for (i = 0; i < 15; i++) {
lchId_type_table[i+1] = *lch_contents[i];
}
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c
index cfe6752c96..ab53f85c60 100644
--- a/epan/dissectors/packet-ndmp.c
+++ b/epan/dissectors/packet-ndmp.c
@@ -3245,7 +3245,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
}
- /* If fragmentation is neccessary */
+ /* If fragmentation is necessary */
if (do_frag)
{
pinfo->fragmented = TRUE;
diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c
index e7fbb35de9..d6ae2d3fe8 100644
--- a/epan/dissectors/packet-netbios.c
+++ b/epan/dissectors/packet-netbios.c
@@ -154,7 +154,7 @@ static const value_string nb_name_type_vals[] = {
{0x00, "Workstation/Redirector"},
{0x01, "Browser"},
{0x02, "Workstation/Redirector"},
- /* not sure what 0x02 is, I'm seeing alot of them however */
+ /* not sure what 0x02 is, I'm seeing a lot of them however */
/* i'm seeing them with workstation/redirection host
announcements */
{0x03, "Messenger service/Main name"},
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index 3f4bbb4986..507fcf36ca 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -6989,7 +6989,7 @@ dissect_nfs4_security_label(tvbuff_t *tvb, proto_tree *tree, int offset)
offset = dissect_rpc_uint32(tvb, tree, hf_nfs_fattr4_security_label_lfs, offset);
offset = dissect_rpc_uint32(tvb, tree, hf_nfs_fattr4_security_label_pi, offset);
- offset = dissect_nfs_utf8string(tvb, offset, tree,
+ offset = dissect_nfs_utf8string(tvb, offset, tree,
hf_nfs_fattr4_security_label_context, NULL);
return offset;
@@ -7336,7 +7336,7 @@ dissect_nfs_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo,
break;
case FATTR4_SECURITY_LABEL:
- attr_vals_offset = dissect_nfs4_security_label(tvb,
+ attr_vals_offset = dissect_nfs4_security_label(tvb,
attr_newftree, attr_vals_offset);
break;
default:
@@ -10625,7 +10625,7 @@ void reg_callback(int cbprog)
/*
* Register the procedure tables. The version should be 4,
* but some Linux kernels set this field to 1. "Temporarily",
- * accomodate these servers.
+ * accommodate these servers.
*/
rpc_init_proc_table(cbprog, 1, nfs_cb_proc, hf_nfs_cb_procedure);
rpc_init_proc_table(cbprog, 4, nfs_cb_proc, hf_nfs_cb_procedure);
diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c
index ec781a39ae..7bd85d6bb3 100644
--- a/epan/dissectors/packet-ntlmssp.c
+++ b/epan/dissectors/packet-ntlmssp.c
@@ -2091,7 +2091,7 @@ decrypt_data_payload(tvbuff_t *tvb, int offset, guint32 encrypted_block_length,
/* We setup a temporary buffer so we can re-encrypt the payload after
decryption. This is to update the opposite peer's RC4 state
it's useful when we have only one key for both conversation
- in case of KEY_EXCH we have independant key so this is not needed*/
+ in case of KEY_EXCH we have independent key so this is not needed*/
if (!(NTLMSSP_NEGOTIATE_KEY_EXCH & conv_ntlmssp_info->flags)) {
guint8 *peer_block;
peer_block = ep_memdup(packet_ntlmssp_info->decrypted_payload, encrypted_block_length);
@@ -2330,7 +2330,7 @@ decrypt_verifier(tvbuff_t *tvb, int offset, guint32 encrypted_block_length,
/* We setup a temporary buffer so we can re-encrypt the payload after
decryption. This is to update the opposite peer's RC4 state
This is not needed when we just have EXTENDED SECURITY because the signature is not crypted
- and it's also not needed when we have key exchange because server and client have independant keys */
+ and it's also not needed when we have key exchange because server and client have independent keys */
if (!(NTLMSSP_NEGOTIATE_KEY_EXCH & conv_ntlmssp_info->flags) && !(NTLMSSP_NEGOTIATE_EXTENDED_SECURITY & conv_ntlmssp_info->flags)) {
peer_block = ep_memdup(packet_ntlmssp_info->verifier, encrypted_block_length);
crypt_rc4(rc4_state_peer, peer_block, encrypted_block_length);
diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c
index bd4bc2f53b..fa9603efb6 100644
--- a/epan/dissectors/packet-opensafety.c
+++ b/epan/dissectors/packet-opensafety.c
@@ -917,7 +917,7 @@ dissect_opensafety_ssdo_message(tvbuff_t *message_tvb , packet_info *pinfo, prot
} else {
/* Either the SSDO msg is a response, then data is sent by the server and only in uploads,
- * or the message is a request, then data is comming from the client and payload data is
+ * or the message is a request, then data is coming from the client and payload data is
* sent in downloads */
if ( ( isResponse && (sacmd == OPENSAFETY_MSG_SSDO_UPLOAD_INITIATE_SEGMENTED ||
sacmd == OPENSAFETY_MSG_SSDO_UPLOAD_INITIATE_EXPEDITED ||
diff --git a/epan/dissectors/packet-ppi-vector.c b/epan/dissectors/packet-ppi-vector.c
index 8c005a6813..2a1da5dc41 100644
--- a/epan/dissectors/packet-ppi-vector.c
+++ b/epan/dissectors/packet-ppi-vector.c
@@ -737,7 +737,7 @@ dissect_ppi_vector_v2(tvbuff_t *tvb, int offset, gint length_remaining, proto_tr
}
/*
* vchars is another field that we want to pre-process simillar to vflags and for the same reasons.
- * we perform seperate length checks depending on if vector_flags is present (which would precede vector_chars)
+ * we perform separate length checks depending on if vector_flags is present (which would precede vector_chars)
*/
if ( ( (present & PPI_VECTOR_MASK_VFLAGS)) && (present & PPI_VECTOR_MASK_VCHARS) && length_remaining >= 8)
chars = tvb_get_letohl(tvb, offset + 4);
diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c
index dda9e86a75..7588b81455 100644
--- a/epan/dissectors/packet-qsig.c
+++ b/epan/dissectors/packet-qsig.c
@@ -12352,7 +12352,7 @@ static const qsig_err_t qsig_err_tab[] = {
static const qsig_op_t *get_op(gint32 opcode) {
int i;
- /* search from the end to get the last occurence if the operation is redefined in some newer specification */
+ /* search from the end to get the last occurrence if the operation is redefined in some newer specification */
for (i = array_length(qsig_op_tab) - 1; i >= 0; i--)
if (qsig_op_tab[i].opcode == opcode)
return &qsig_op_tab[i];
@@ -12368,7 +12368,7 @@ static gint32 get_service(gint32 opcode) {
static const qsig_err_t *get_err(gint32 errcode) {
int i;
- /* search from the end to get the last occurence if the operation is redefined in some newer specification */
+ /* search from the end to get the last occurrence if the operation is redefined in some newer specification */
for (i = array_length(qsig_err_tab) - 1; i >= 0; i--)
if (qsig_err_tab[i].errcode == errcode)
return &qsig_err_tab[i];
diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c
index f03c6ef18f..cd6fceaaf8 100644
--- a/epan/dissectors/packet-sbus.c
+++ b/epan/dissectors/packet-sbus.c
@@ -599,7 +599,7 @@ is_sbus_pdu(tvbuff_t *tvb)
return FALSE;
}
- /* the length must be >= 8 bytes to accomodate the header,
+ /* the length must be >= 8 bytes to accommodate the header,
it also must be <65536 to fit inside a udp packet
*/
length=tvb_get_ntohl(tvb, 0);
diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c
index 0db54d7aeb..9cdbcf21d0 100644
--- a/epan/dissectors/packet-sccp.c
+++ b/epan/dissectors/packet-sccp.c
@@ -2343,7 +2343,7 @@ dissect_sccp_data_param(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
return;
}
- /* No sub-dissection occured, treat it as raw data */
+ /* No sub-dissection occurred, treat it as raw data */
call_dissector(data_handle, tvb, pinfo, tree);
}
diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c
index fbb95dfb46..c2b1c669a9 100644
--- a/epan/dissectors/packet-sctp.c
+++ b/epan/dissectors/packet-sctp.c
@@ -2330,7 +2330,7 @@ add_fragment(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 tsn,
}
- /* save begin or end if neccessary */
+ /* save begin or end if necessary */
if (b_bit && !e_bit) {
beginend = g_malloc (sizeof (sctp_frag_be));
beginend->fragment = fragment;
@@ -2581,7 +2581,7 @@ fragment_reassembly(tvbuff_t *tvb, sctp_fragment* fragment,
/* now copy all fragments */
if (begin->fragment->tsn > end->fragment->tsn) {
- /* a tsn restart has occured */
+ /* a tsn restart has occurred */
for (frag_i = first_frag;
frag_i;
frag_i = frag_i->next) {
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index 114df746ef..7a481a97a2 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -1002,7 +1002,7 @@ dissect_sip_uri(tvbuff_t *tvb, packet_info *pinfo _U_, gint start_offset,
/* Set uri start offset in case this was called directly */
uri_offsets->uri_start = current_offset;
- /* Check if it's realy a sip uri ( it might be a tel uri, parse that?) */
+ /* Check if it's really a sip uri ( it might be a tel uri, parse that?) */
tvb_find_guint8(tvb, current_offset, line_end_offset - current_offset, ':');
if (tvb_strneql(tvb, current_offset, "sip", 3) != 0)
return -1;
@@ -3074,7 +3074,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
}
/* We've finished writing to the info col for this SIP message
- * Set fence in case there is more than one (SIP)message in the frame
+ * Set fence in case there is more than one (SIP)message in the frame
*/
col_append_str(pinfo->cinfo, COL_INFO, " | ");
col_set_fence(pinfo->cinfo, COL_INFO);
diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c
index b4277c2fe8..1443728e50 100644
--- a/epan/dissectors/packet-skinny.c
+++ b/epan/dissectors/packet-skinny.c
@@ -3780,14 +3780,14 @@ proto_register_skinny(void)
{ &hf_skinny_hookFlashDetectMode,
{ "Hook flash mode", "skinny.hookFlashDetectMode",
FT_UINT32, BASE_DEC, VALS(skinny_hookFlashDetectModes), 0x0,
- "Which method to use to detect that a hook flash has occured",
+ "Which method to use to detect that a hook flash has occurred",
HFILL }
},
{ &hf_skinny_detectInterval,
{ "HF Detect Interval", "skinny.detectInterval",
FT_UINT32, BASE_DEC, NULL, 0x0,
- "The number of milliseconds that determines a hook flash has occured",
+ "The number of milliseconds that determines a hook flash has occurred",
HFILL }
},
diff --git a/epan/dissectors/packet-slowprotocols.c b/epan/dissectors/packet-slowprotocols.c
index bfbf3b08fd..11f0886b5e 100644
--- a/epan/dissectors/packet-slowprotocols.c
+++ b/epan/dissectors/packet-slowprotocols.c
@@ -3199,7 +3199,7 @@ proto_register_slow_protocols(void)
{ &hf_oampdu_flags_dying_gasp,
{ "Dying Gasp", "slow.oam.flags.dyingGasp",
FT_BOOLEAN, 8, TFS(&tfs_true_false), OAMPDU_FLAGS_DYING_GASP,
- "An unrecoverable local failure occured. True = 1, False = 0", HFILL }},
+ "An unrecoverable local failure occurred. True = 1, False = 0", HFILL }},
{ &hf_oampdu_flags_critical_event,
{ "Critical Event", "slow.oam.flags.criticalEvent",
diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c
index 354e5708d2..5c4b597a5d 100644
--- a/epan/dissectors/packet-smtp.c
+++ b/epan/dissectors/packet-smtp.c
@@ -442,7 +442,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/*
* The order of these is important ... We want to avoid
* cases where there is a CRLF at the end of a packet and a
- * .CRLF at the begining of the same packet.
+ * .CRLF at the beginning of the same packet.
*/
if ((session_state->crlf_seen && tvb_strneql(tvb, loffset, ".\r\n", 3) == 0) ||
tvb_strneql(tvb, loffset, "\r\n.\r\n", 5) == 0)
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c
index cc07f46e7c..2655923b0b 100644
--- a/epan/dissectors/packet-ssl.c
+++ b/epan/dissectors/packet-ssl.c
@@ -1732,7 +1732,7 @@ dissect_ssl3_record(tvbuff_t *tvb, packet_info *pinfo,
*/
}
- /* show on info colum what we are decoding */
+ /* show on info column what we are decoding */
col_append_str(pinfo->cinfo, COL_INFO, "Application Data");
/* we need dissector information when the selected packet is shown.
@@ -2161,7 +2161,7 @@ dissect_ssl3_handshake(tvbuff_t *tvb, packet_info *pinfo,
/* get encrypted data, on tls1 we have to skip two bytes
* (it's the encrypted len and should be equal to record len - 2)
- * in case of rsa1024 that would be 128 + 2 = 130; for psk not neccessary
+ * in case of rsa1024 that would be 128 + 2 = 130; for psk not necessary
*/
if (ssl->cipher_suite.kex==KEX_RSA && (ssl->version == SSL_VER_TLS||ssl->version == SSL_VER_TLSv1DOT1||ssl->version == SSL_VER_TLSv1DOT2))
{
diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c
index 05029c2735..8a0d43b36e 100644
--- a/epan/dissectors/packet-sua.c
+++ b/epan/dissectors/packet-sua.c
@@ -2248,7 +2248,7 @@ dissect_sua_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *sua_t
if (dissector_try_heuristic(heur_subdissector_list, data_tvb, pinfo, tree, NULL)) {
return;
}
- /* No sub-dissection occured, treat it as raw data */
+ /* No sub-dissection occurred, treat it as raw data */
call_dissector(data_handle, data_tvb, pinfo, tree);
}
}
diff --git a/epan/dissectors/packet-tetra.c b/epan/dissectors/packet-tetra.c
index 12736c6cf9..36a1703734 100644
--- a/epan/dissectors/packet-tetra.c
+++ b/epan/dissectors/packet-tetra.c
@@ -10530,7 +10530,7 @@ void proto_register_tetra (void)
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_tetra_type2_existance,
- { "type2-existance", "tetra.type2_existance",
+ { "type2-existence", "tetra.type2_existence",
FT_BOOLEAN, BASE_NONE, NULL, 0,
"BOOLEAN", HFILL }},
{ &hf_tetra_type3_identifier,
diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c
index 55a5e01f28..315596a10d 100644
--- a/epan/dissectors/packet-umts_fp.c
+++ b/epan/dissectors/packet-umts_fp.c
@@ -3480,7 +3480,7 @@ dissect_hsdsch_type_2_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree
* Dissect and CONFIGURE hsdsch_common channel.
*
* This will dissect hsdsch common channels of type 2, so this is
-* very similar to regular type two (ehs) the diffrence being how
+* very similar to regular type two (ehs) the difference being how
* the configuration is done. NOTE: VERY EXPERIMENTAL.
*
* @param tvb
diff --git a/epan/dissectors/packet-umts_mac.h b/epan/dissectors/packet-umts_mac.h
index 78f8f95184..e6dd4f70bf 100644
--- a/epan/dissectors/packet-umts_mac.h
+++ b/epan/dissectors/packet-umts_mac.h
@@ -65,12 +65,12 @@ typedef struct umts_mac_info
{
gboolean ctmux[MAX_MAC_FRAMES];
guint8 content[MAX_MAC_FRAMES];
- guint8 lchid[MAX_MAC_FRAMES]; /*Makes displaying logical channel alot easier*/
- guint8 macdflow_id[MAX_MAC_FRAMES]; /*Makes displaying logical channel alot easier*/
+ guint8 lchid[MAX_MAC_FRAMES]; /*Makes displaying logical channel a lot easier*/
+ guint8 macdflow_id[MAX_MAC_FRAMES]; /*Makes displaying logical channel a lot easier*/
gboolean fake_chid[MAX_MAC_FRAMES]; /*Indicate if the child ID is faked or not*/
guint pdu_len; /*Length of MAC PDU, same for all PDUs in one FP frame*/
- guint8 trchid[MAX_MAC_FRAMES]; /*Makes displaying logical channel alot easier*/
+ guint8 trchid[MAX_MAC_FRAMES]; /*Makes displaying logical channel a lot easier*/
} umts_mac_info;
typedef struct
diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c
index b2b1b941d5..941497664e 100644
--- a/epan/dissectors/packet-v5ua.c
+++ b/epan/dissectors/packet-v5ua.c
@@ -120,7 +120,7 @@ static gint ett_v5ua_layer3 = -1;
#define DRAFT 0x2
/* Version of IUA */
static int iua_version = RFC;
- /* Variables neccessary for dissection of draft messages */
+ /* Variables necessary for dissection of draft messages */
static int msg_class = -1;
static int msg_type = -1;
static int msg_length = -1;
diff --git a/epan/dissectors/packet-vssmonitoring.c b/epan/dissectors/packet-vssmonitoring.c
index 3ed79be623..c2cb65036f 100644
--- a/epan/dissectors/packet-vssmonitoring.c
+++ b/epan/dissectors/packet-vssmonitoring.c
@@ -120,7 +120,7 @@ dissect_vssmonitoring(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
/* There are only heuristics for timestamps, the port stamp can be any value */
if ( vssmonitoring_use_heuristics ) {
- /* The timestamp will be based on the uptime untill the TAP is completely booted,
+ /* The timestamp will be based on the uptime until the TAP is completely booted,
* this takes about 60s, but use 1 hour to be sure
*/
if (vssmonitoring_time.secs > 3600) {
diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c
index d1306b6c79..9bebe16bc6 100644
--- a/epan/dissectors/packet-x11.c
+++ b/epan/dissectors/packet-x11.c
@@ -4682,7 +4682,7 @@ dissect_x11_replies(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
* - reply to initial connection
* - errorreply (a request generated an error)
* - requestreply (reply to a request)
- * - event (some event occured)
+ * - event (some event occurred)
*/
if (g_hash_table_lookup(state->seqtable,
GINT_TO_POINTER(state->sequencenumber)) == (int *)INITIAL_CONN
diff --git a/epan/filesystem.c b/epan/filesystem.c
index db48f0962b..a38cf86d1d 100644
--- a/epan/filesystem.c
+++ b/epan/filesystem.c
@@ -1710,7 +1710,7 @@ file_exists(const char *fname)
* but it *is* set to zero if stat() returns without an error,
* so this is working, but maybe not quite the way expected. ULFL
*/
- file_stat.st_ino = 1; /* this will make things work if an error occured */
+ file_stat.st_ino = 1; /* this will make things work if an error occurred */
ws_stat64(fname, &file_stat);
if (file_stat.st_ino == 0) {
return TRUE;
diff --git a/epan/strutil.h b/epan/strutil.h
index 781ef4a5e2..833b4b9b37 100644
--- a/epan/strutil.h
+++ b/epan/strutil.h
@@ -220,7 +220,7 @@ guint8 * convert_string_to_hex(const char *string, size_t *nbytes);
*/
char * convert_string_case(const char *string, gboolean case_insensitive);
-/** Finds the first occurence of string 'needle' in string 'haystack'.
+/** Finds the first occurrence of string 'needle' in string 'haystack'.
* The matching is done in a case insensitive manner.
*
* @param haystack The string possibly containing the substring
@@ -256,7 +256,7 @@ gchar* ws_strdup_escape_char (const gchar *str, const gchar chr);
*
* @param str The string to be copied
* @param char The character to be escaped
- * @return A copy of the string with every occurence of double 'chr' in
+ * @return A copy of the string with every occurrence of double 'chr' in
* the original string being copied as a single 'chr'.
*/
gchar* ws_strdup_unescape_char (const gchar *str, const gchar chr);
@@ -273,7 +273,7 @@ gchar* ws_strdup_unescape_char (const gchar *str, const gchar chr);
gchar *string_replace(const gchar* str, const gchar *old_val, const gchar *new_val);
/**
- * g_strcmp0 appears first in GLIB 2.16, define it locally for earlier versions.
+ * g_strcmp0 appears first in GLIB 2.16, define it locally for earlier versions.
*/
#if !GLIB_CHECK_VERSION(2,16,0)
diff --git a/epan/tcap-persistentdata.c b/epan/tcap-persistentdata.c
index 189504b33c..7312fe5600 100644
--- a/epan/tcap-persistentdata.c
+++ b/epan/tcap-persistentdata.c
@@ -1078,11 +1078,11 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
/* check if we have to create a new record or not */
/* if last request has been responded (response number is known)
and this request appears after last response (has bigger frame number)
- and last request occured after the timeout for repetition,
+ and last request occurred after the timeout for repetition,
or
if last request hasn't been responded (so number unknown)
and this request appears after last request (has bigger frame number)
- and this request occured after the timeout for message lost */
+ and this request occurred after the timeout for message lost */
if ( ( p_tcaphash_begincall->context->last_frame != 0
&& pinfo->fd->num > p_tcaphash_begincall->context->first_frame
&& (guint) pinfo->fd->abs_ts.secs > (guint)(p_tcaphash_begincall->context->begin_time.secs + gtcap_RepetitionTimeout)
@@ -1592,11 +1592,11 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
/* check if we have to create a new record or not */
/* if last request has been responded (response number in known)
and this request appears after last response (has bigger frame number)
- and last request occured after the timeout for repetition,
+ and last request occurred after the timeout for repetition,
or
if last request hasn't been responded (so number unknown)
and this request appears after last request (has bigger frame number)
- and this request occured after the timeout for message lost */
+ and this request occurred after the timeout for message lost */
if ( ( p_tcaphash_ansicall->context->last_frame != 0
&& pinfo->fd->num > p_tcaphash_ansicall->context->first_frame
&& (guint) pinfo->fd->abs_ts.secs > (guint)(p_tcaphash_ansicall->context->begin_time.secs + gtcap_RepetitionTimeout)
diff --git a/epan/tvbuff.c b/epan/tvbuff.c
index d6823080ca..73a1fe6f5d 100644
--- a/epan/tvbuff.c
+++ b/epan/tvbuff.c
@@ -1867,7 +1867,7 @@ tvb_get_bits(tvbuff_t *tvb, const guint bit_offset, const gint no_of_bits, const
return (guint32)_tvb_get_bits64(tvb, bit_offset, no_of_bits);
}
-/* Find first occurence of needle in tvbuff, starting at offset. Searches
+/* Find first occurrence of needle in tvbuff, starting at offset. Searches
* at most maxlength number of bytes; if maxlength is -1, searches to
* end of tvbuff.
* Returns the offset of the found needle, or -1 if not found.
@@ -1932,7 +1932,7 @@ tvb_find_guint8(tvbuff_t *tvb, const gint offset, const gint maxlength, const gu
return -1;
}
-/* Find first occurence of any of the needles in tvbuff, starting at offset.
+/* Find first occurrence of any of the needles in tvbuff, starting at offset.
* Searches at most maxlength number of bytes; if maxlength is -1, searches
* to end of tvbuff.
* Returns the offset of the found needle, or -1 if not found.
diff --git a/epan/tvbuff.h b/epan/tvbuff.h
index f873d76ad6..86ecf1c027 100644
--- a/epan/tvbuff.h
+++ b/epan/tvbuff.h
@@ -360,7 +360,7 @@ extern void* ep_tvb_memdup(tvbuff_t *tvb, const gint offset, size_t length);
* tvbuff_free_cb_t() is called, if any. */
extern const guint8* tvb_get_ptr(tvbuff_t*, const gint offset, const gint length);
-/** Find first occurence of needle in tvbuff, starting at offset. Searches
+/** Find first occurrence of needle in tvbuff, starting at offset. Searches
* at most maxlength number of bytes; if maxlength is -1, searches to
* end of tvbuff.
* Returns the offset of the found needle, or -1 if not found.
@@ -370,7 +370,7 @@ extern const guint8* tvb_get_ptr(tvbuff_t*, const gint offset, const gint length
extern gint tvb_find_guint8(tvbuff_t*, const gint offset, const gint maxlength,
const guint8 needle);
-/** Find first occurence of any of the needles in tvbuff, starting at offset.
+/** Find first occurrence of any of the needles in tvbuff, starting at offset.
* Searches at most maxlength number of bytes. Returns the offset of the
* found needle, or -1 if not found and the found needle.
* Will not throw an exception, even if
diff --git a/epan/wmem/wmem_allocator_block.c b/epan/wmem/wmem_allocator_block.c
index d0987f285e..608c3fc6d8 100644
--- a/epan/wmem/wmem_allocator_block.c
+++ b/epan/wmem/wmem_allocator_block.c
@@ -57,7 +57,7 @@
* embedded, so the only additional storage cost is two pointers: one to the
* head of this list and one to the priority divider of the list (explained
* in more detail later). See the wmem_block_free_t structure.
- *
+ *
* Alloc is implemented very similarly to before. The first chunk in the free
* list is checked. If it has enough space, it is used (potentially splitting
* the chunk in two - the allocated part and the remaining free space). If it
@@ -517,7 +517,7 @@ wmem_block_alloc(void *private_data, const size_t size)
wmem_block_chunk_t *chunk;
/* We can't allocate more than will fit in a block (less our header),
- * which is an aweful lot. */
+ * which is an awful lot. */
g_assert(size < WMEM_BLOCK_SIZE - sizeof(wmem_block_chunk_t));
if (allocator->free_list_head == NULL) {
diff --git a/epan/wslua/wslua_tvb.c b/epan/wslua/wslua_tvb.c
index 06f44e1dd6..e89d801339 100644
--- a/epan/wslua/wslua_tvb.c
+++ b/epan/wslua/wslua_tvb.c
@@ -600,7 +600,7 @@ static TvbRange new_TvbRange(lua_State* L, tvbuff_t* ws_tvb, int offset, int len
WSLUA_METHOD Tvb_range(lua_State* L) {
/* Creates a tvbr from this Tvb. This is used also as the Tvb:__call() metamethod. */
-#define WSLUA_OPTARG_Tvb_range_OFFSET 2 /* The offset (in octets) from the begining of the Tvb. Defaults to 0. */
+#define WSLUA_OPTARG_Tvb_range_OFFSET 2 /* The offset (in octets) from the beginning of the Tvb. Defaults to 0. */
#define WSLUA_OPTARG_Tvb_range_LENGTH 3 /* The length (in octets) of the range. Defaults to until the end of the Tvb. */
Tvb tvb = checkTvb(L,1);
@@ -1193,7 +1193,7 @@ WSLUA_METHOD TvbRange_bytes(lua_State* L) {
WSLUA_METHOD TvbRange_bitfield(lua_State* L) {
/* Get a bitfield from a TvbRange. */
-#define WSLUA_OPTARG_TvbRange_bitfield_POSITION 2 /* The bit offset from the begining of the TvbRange. Defaults to 0. */
+#define WSLUA_OPTARG_TvbRange_bitfield_POSITION 2 /* The bit offset from the beginning of the TvbRange. Defaults to 0. */
#define WSLUA_OPTARG_TvbRange_bitfield_LENGTH 3 /* The length (in bits) of the field. Defaults to 1. */
TvbRange tvbr = checkTvbRange(L,1);
@@ -1233,13 +1233,13 @@ WSLUA_METHOD TvbRange_bitfield(lua_State* L) {
WSLUA_METHOD TvbRange_range(lua_State* L) {
/* Creates a sub-TvbRange from this TvbRange. This is used also as the TvbRange:__call() metamethod. */
-#define WSLUA_OPTARG_TvbRange_range_OFFSET 2 /* The offset (in octets) from the begining of the TvbRange. Defaults to 0. */
+#define WSLUA_OPTARG_TvbRange_range_OFFSET 2 /* The offset (in octets) from the beginning of the TvbRange. Defaults to 0. */
#define WSLUA_OPTARG_TvbRange_range_LENGTH 3 /* The length (in octets) of the range. Defaults to until the end of the TvbRange. */
TvbRange tvbr = checkTvbRange(L,1);
int offset = luaL_optint(L,WSLUA_OPTARG_TvbRange_range_OFFSET,0);
int len;
-
+
if (!(tvbr && tvbr->tvb)) return 0;
len = luaL_optint(L,WSLUA_OPTARG_TvbRange_range_LENGTH,tvbr->len-offset);
diff --git a/file.h b/file.h
index 34685caa54..382b2a18f4 100644
--- a/file.h
+++ b/file.h
@@ -169,7 +169,7 @@ gboolean cf_read_frame(capture_file *cf, frame_data *fdata);
* @param cf the capture file to be read from
* @param fname the filename to be read from
* @param is_tempfile is this a temporary file?
- * @param err the error code, if an error had occured
+ * @param err the error code, if an error had occurred
* @return one of cf_status_t
*/
cf_status_t cf_start_tail(capture_file *cf, const char *fname, gboolean is_tempfile, int *err);
@@ -179,7 +179,7 @@ cf_status_t cf_start_tail(capture_file *cf, const char *fname, gboolean is_tempf
*
* @param cf the capture file to be read from
* @param to_read the number of packets to read
- * @param err the error code, if an error had occured
+ * @param err the error code, if an error had occurred
* @return one of cf_read_status_t
*/
cf_read_status_t cf_continue_tail(capture_file *cf, volatile int to_read, int *err);
@@ -195,7 +195,7 @@ void cf_fake_continue_tail(capture_file *cf);
* Finish reading from "end" of a capture file.
*
* @param cf the capture file to be read from
- * @param err the error code, if an error had occured
+ * @param err the error code, if an error had occurred
* @return one of cf_read_status_t
*/
cf_read_status_t cf_finish_tail(capture_file *cf, int *err);
@@ -318,7 +318,7 @@ void cf_set_drops_known(capture_file *cf, gboolean drops_known);
* Set the number of packet drops while capturing.
*
* @param cf the capture file
- * @param drops the number of packet drops occured while capturing
+ * @param drops the number of packet drops occurred while capturing
*/
void cf_set_drops(capture_file *cf, guint32 drops);
@@ -334,7 +334,7 @@ gboolean cf_get_drops_known(capture_file *cf);
* Get the number of packet drops while capturing.
*
* @param cf the capture file
- * @return the number of packet drops occured while capturing
+ * @return the number of packet drops occurred while capturing
*/
guint32 cf_get_drops(capture_file *cf);
diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c
index 98b1e366d6..1d1ea691de 100644
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/profinet/packet-dcerpc-pn-io.c
@@ -41,7 +41,7 @@
* There are some other related PROFINET protocols (e.g. PN-DCP, which is
* handling addressing topics).
*
- * Please note: the PROFINET CBA protocol is independant of the PN-IO protocol!
+ * Please note: the PROFINET CBA protocol is independent of the PN-IO protocol!
*/
diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c
index 564375ff47..6e2fffb3b9 100644
--- a/ui/gtk/conversations_table.c
+++ b/ui/gtk/conversations_table.c
@@ -2130,7 +2130,7 @@ draw_ct_table_data(conversations_table *ct)
-1);
}
else {
- /* Only changable entries */
+ /* Only changeable entries */
gtk_list_store_set (store, &conversation->iter,
PACKETS_COLUMN, conversation->tx_frames+conversation->rx_frames,
BYTES_COLUMN, conversation->tx_bytes+conversation->rx_bytes,
diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c
index c9b5beb324..15a2359d51 100644
--- a/ui/gtk/gui_utils.c
+++ b/ui/gtk/gui_utils.c
@@ -1277,7 +1277,7 @@ get_default_col_size(GtkWidget *view,
/*
* This function can be called from gtk_tree_view_column_set_cell_data_func()
- * the user data must be the colum number.
+ * the user data must be the column number.
* Present floats with two decimals
*/
void
@@ -1312,7 +1312,7 @@ float_data_func(GtkTreeViewColumn *column _U_,
/*
* This function can be called from gtk_tree_view_column_set_cell_data_func()
- * the user data must be the colum number.
+ * the user data must be the column number.
* Present value as hexadecimal.
*/
void
diff --git a/ui/gtk/gui_utils.h b/ui/gtk/gui_utils.h
index b863064df3..5a4d7c5c91 100644
--- a/ui/gtk/gui_utils.h
+++ b/ui/gtk/gui_utils.h
@@ -312,57 +312,57 @@ extern gchar *create_user_window_title(const gchar *caption);
extern void set_window_title(GtkWidget *win, const gchar *caption);
/** Renders a float with two decimals precission, called from gtk_tree_view_column_set_cell_data_func().
- * the user data must be the colum number.
+ * the user data must be the column number.
* Present floats with two decimals
*
* @param column A GtkTreeColumn
* @param renderer The GtkCellRenderer that is being rendered by tree_column
* @param model The GtkTreeModel being rendered
* @param iter A GtkTreeIter of the current row rendered
- * @param user_data must be the colum number to fetch the data from
+ * @param user_data must be the column number to fetch the data from
*/
void float_data_func (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data);
/** Renders a unsinged integer as a hexadecimal value, called from gtk_tree_view_column_set_cell_data_func()
- * The user data must be the colum number.
+ * The user data must be the column number.
* Present value as hexadecimal.
* @param column A GtkTreeColumn
* @param renderer The GtkCellRenderer that is being rendered by tree_column
* @param model The GtkTreeModel being rendered
* @param iter A GtkTreeIter of the current row rendered
- * @param user_data must be the colum number to fetch the data from
+ * @param user_data must be the column number to fetch the data from
*/
void present_as_hex_func (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data);
/** Renders an unsigned 64 bits integer with space as thousand separator, called from gtk_tree_view_column_set_cell_data_func()
- * The user data must be the colum number.
+ * The user data must be the column number.
* Present value as hexadecimal.
* @param column A GtkTreeColumn
* @param renderer The GtkCellRenderer that is being rendered by tree_column
* @param model The GtkTreeModel being rendered
* @param iter A GtkTreeIter of the current row rendered
- * @param user_data must be the colum number to fetch the data from
+ * @param user_data must be the column number to fetch the data from
*/
void u64_data_func (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data);
/** This function can be called from gtk_tree_view_column_set_cell_data_func()
- * the user data must be the colum number.
+ * the user data must be the column number.
* Present value as hexadecimal.
* @param column A GtkTreeColumn
* @param renderer The GtkCellRenderer that is being rendered by tree_column
* @param model The GtkTreeModel being rendered
* @param iter A GtkTreeIter of the current row rendered
- * @param user_data must be the colum number to fetch the data from
+ * @param user_data must be the column number to fetch the data from
*/
void str_ptr_data_func(GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data);
/** This function can be called from gtk_tree_sortable_set_sort_func()
- * the user data must be the colum number.
+ * the user data must be the column number.
* Used together with str_ptr_data_func to sort the corresponding column.
* @param model The GtkTreeModel the comparison is within
* @param a A GtkTreeIter in model
* @param b Another GtkTreeIter in model
- * @param user_data must be the colum number to fetch the data from
+ * @param user_data must be the column number to fetch the data from
*/
gint str_ptr_sort_func(GtkTreeModel *model,
diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c
index 3ebaece893..2942e7a88f 100644
--- a/ui/gtk/iax2_analysis.c
+++ b/ui/gtk/iax2_analysis.c
@@ -2381,7 +2381,7 @@ static gboolean copy_file(gchar *dest, gint channels, gint format, user_data_t *
if (format == SAVE_AU_FORMAT) /* au format */
{
- /* First we write the .au header. XXX Hope this is endian independant */
+ /* First we write the .au header. XXX Hope this is endian independent */
/* the magic word 0x2e736e64 == .snd */
/* XXX: Should we be checking for write errors below ? */
phtonl(pd, 0x2e736e64);
diff --git a/ui/gtk/packet_list.c b/ui/gtk/packet_list.c
index 477c2b55ac..71cde9b753 100644
--- a/ui/gtk/packet_list.c
+++ b/ui/gtk/packet_list.c
@@ -394,14 +394,14 @@ col_details_edit_dlg (gint col_id, GtkTreeViewColumn *col)
ws_gtk_grid_attach_defaults(GTK_GRID(main_grid), occurrence_lb, 0, 3, 1, 1);
gtk_misc_set_alignment(GTK_MISC(occurrence_lb), 1.0f, 0.5f);
gtk_widget_set_tooltip_text (occurrence_lb,
- "Field occurence to use. "
+ "Field occurrence to use. "
"0=all (default), 1=first, 2=second, ..., -1=last.");
occurrence_te = gtk_entry_new();
gtk_entry_set_max_length (GTK_ENTRY(occurrence_te), 4);
ws_gtk_grid_attach_defaults(GTK_GRID(main_grid), occurrence_te, 1, 3, 1, 1);
gtk_widget_set_tooltip_text (occurrence_te,
- "Field occurence to use. "
+ "Field occurrence to use. "
"0=all (default), 1=first, 2=second, ..., -1=last.");
bbox = dlg_button_row_new(GTK_STOCK_CANCEL,GTK_STOCK_OK, NULL);
diff --git a/ui/gtk/prefs_column.c b/ui/gtk/prefs_column.c
index 3e0504b133..9cd2e3fa3a 100644
--- a/ui/gtk/prefs_column.c
+++ b/ui/gtk/prefs_column.c
@@ -297,7 +297,7 @@ column_prefs_show(GtkWidget *prefs_window) {
ws_gtk_grid_attach_extended(GTK_GRID(grid), occurrence_lb, 2, 1, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
gtk_widget_set_sensitive(occurrence_lb, FALSE);
gtk_widget_set_tooltip_text(occurrence_lb,
- "Field occurence to use. "
+ "Field occurrence to use. "
"0=all (default), 1=first, 2=second, ..., -1=last.");
gtk_widget_show(occurrence_lb);
@@ -313,7 +313,7 @@ column_prefs_show(GtkWidget *prefs_window) {
ws_gtk_grid_attach_extended(GTK_GRID(grid), occurrence_te, 3, 1, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
gtk_widget_set_sensitive(occurrence_te, FALSE);
gtk_widget_set_tooltip_text(occurrence_te,
- "Field occurence to use. "
+ "Field occurrence to use. "
"0=all (default), 1=first, 2=second, ..., -1=last.");
gtk_widget_show(occurrence_te);
diff --git a/ui/gtk/rlc_lte_graph.c b/ui/gtk/rlc_lte_graph.c
index 10e1925657..0241b36be6 100644
--- a/ui/gtk/rlc_lte_graph.c
+++ b/ui/gtk/rlc_lte_graph.c
@@ -1199,7 +1199,7 @@ static void graph_pixmap_draw(struct graph *g)
#endif
/* N.B. This makes drawing circles take half the time of the default setting.
- Changing from the default fill rule didn't make any noticable difference
+ Changing from the default fill rule didn't make any noticeable difference
though */
cairo_set_tolerance(cr_elements, 1.0);
@@ -2663,7 +2663,7 @@ static void rlc_lte_make_elmtlist(struct graph *g)
else {
e0->elment_color_p = &g->style.seq_resegmented_color;
}
-
+
e0->p.ellipse.dim.width = DATA_BLOB_SIZE;
e0->p.ellipse.dim.height = DATA_BLOB_SIZE;
e0->p.ellipse.dim.x = x;
diff --git a/ui/gtk/rtp_player.c b/ui/gtk/rtp_player.c
index e57f1f0002..610de8dc1b 100644
--- a/ui/gtk/rtp_player.c
+++ b/ui/gtk/rtp_player.c
@@ -215,7 +215,7 @@ typedef struct _rtp_channel_info {
/* defines a RTP packet */
typedef struct _rtp_packet {
struct _rtp_info *info; /* the RTP dissected info */
- double arrive_offset; /* arrive offset time since the begining of the stream in ms */
+ double arrive_offset; /* arrive offset time since the beginning of the stream in ms */
guint8* payload_data;
} rtp_packet_t;
@@ -974,7 +974,7 @@ draw_channel_cursor(rtp_channel_info_t *rci, guint32 start_index)
cairo_fill (cr);
#if GTK_CHECK_VERSION(2,22,0)
- cairo_set_source_surface (cr, rci->surface, idx/MULT, 0);
+ cairo_set_source_surface (cr, rci->surface, idx/MULT, 0);
#else
gdk_cairo_set_source_pixmap (cr, rci->pixmap,idx/MULT, 0);
#endif
@@ -1358,7 +1358,7 @@ static void channel_draw(rtp_channel_info_t* rci)
} else if (status == S_SILENCE) {
draw_color_p = &white_color;
} else {
- draw_color_p = &black_color;
+ draw_color_p = &black_color;
}
/* if silence added by Wireshark, graphically show it with letter to indicate why */
@@ -1506,7 +1506,7 @@ static void channel_draw(rtp_channel_info_t* rci)
} else if (status == S_SILENCE) {
draw_color_p = &white_color;
} else {
- draw_color_p = &black_color;
+ draw_color_p = &black_color;
}
/* if silence added by Wireshark, graphically show it with letter to indicate why */
@@ -1599,7 +1599,7 @@ static gboolean expose_event_channels(GtkWidget *widget, GdkEventExpose *event,
if (gtk_widget_is_drawable(widget)){
cr = gdk_cairo_create (gtk_widget_get_window(widget));
#if GTK_CHECK_VERSION(2,22,0)
- cairo_set_source_surface (cr, rci->surface, 0, 0);
+ cairo_set_source_surface (cr, rci->surface, 0, 0);
#else
gdk_cairo_set_source_pixmap (cr, rci->pixmap, event->area.x, event->area.y);
#endif
diff --git a/ui/gtk/voip_calls.c b/ui/gtk/voip_calls.c
index a9dfffb0f6..78aca8f573 100644
--- a/ui/gtk/voip_calls.c
+++ b/ui/gtk/voip_calls.c
@@ -670,7 +670,7 @@ static void RTP_packet_draw(void *prs _U_)
conv_num = gai->conv_num;
/* if we get the setup frame number, then get the time position to graph the RTP arrow */
if (rtp_listinfo->setup_frame_number == gai->fd->num) {
- /* look again from the begining because there are cases where the Setup frame is after the RTP */
+ /* look again from the beginning because there are cases where the Setup frame is after the RTP */
voip_calls_graph_list = g_list_first(the_tapinfo_struct.graph_analysis->list);
item = 0;
while(voip_calls_graph_list) {
@@ -2345,7 +2345,7 @@ static void mgcpDialedDigits(gchar *signalStr, gchar **dialedDigits)
g_free(*dialedDigits);
g_free(tmpStr);
-
+
*dialedDigits = resultStr;
return;
diff --git a/wiretap/csids.c b/wiretap/csids.c
index 08f60f05ea..a60fd11f39 100644
--- a/wiretap/csids.c
+++ b/wiretap/csids.c
@@ -63,7 +63,7 @@ int csids_open(wtap *wth, int *err, gchar **err_info)
{
/* There is no file header. There is only a header for each packet
* so we read a packet header and compare the caplen with iplen. They
- * should always be equal except with the wierd byteswap version.
+ * should always be equal except with the weird byteswap version.
*
* THIS IS BROKEN-- anytime the caplen is 0x0101 or 0x0202 up to 0x0505
* this will byteswap it. I need to fix this. XXX --mlh
diff --git a/wiretap/vms.c b/wiretap/vms.c
index 36db1def18..56ae0c378e 100644
--- a/wiretap/vms.c
+++ b/wiretap/vms.c
@@ -68,17 +68,17 @@
Example UCX$TRACE output data:
- UCX INTERnet trace RCV packet seq # = 1 at 14-MAY-2003 11:32:10.93
+ UCX INTERnet trace RCV packet seq # = 1 at 14-MAY-2003 11:32:10.93
- IP Version = 4, IHL = 5, TOS = 00, Total Length = 583 = ^x0247
- IP Identifier = ^x702E, Flags (0=0,DF=0,MF=0),
- Fragment Offset = 0 = ^x0000, Calculated Offset = 0 = ^x0000
- IP TTL = 128 = ^x80, Protocol = 17 = ^x11, Header Checksum = ^x70EC
- IP Source Address = 10.20.4.159
- IP Destination Address = 10.20.4.255
+ IP Version = 4, IHL = 5, TOS = 00, Total Length = 583 = ^x0247
+ IP Identifier = ^x702E, Flags (0=0,DF=0,MF=0),
+ Fragment Offset = 0 = ^x0000, Calculated Offset = 0 = ^x0000
+ IP TTL = 128 = ^x80, Protocol = 17 = ^x11, Header Checksum = ^x70EC
+ IP Source Address = 10.20.4.159
+ IP Destination Address = 10.20.4.255
- UDP Source Port = 138, UDP Destination Port = 138
- UDP Header and Datagram Length = 563 = ^x0233, Checksum = ^xB913
+ UDP Source Port = 138, UDP Destination Port = 138
+ UDP Header and Datagram Length = 563 = ^x0233, Checksum = ^xB913
9F04140A 70EC1180 0000702E 47020045 0000 E..G.p.....p....
B1B80E11 | B9133302 8A008A00 | FF04140A 0010 .........3......
@@ -161,7 +161,7 @@ static long vms_seek_next_packet(wtap *wth, int *err, gchar **err_info)
{
long cur_off;
char buf[VMS_LINE_LENGTH];
-
+
while (1) {
cur_off = file_tell(wth->fh);
if (cur_off == -1) {
@@ -192,7 +192,7 @@ static long vms_seek_next_packet(wtap *wth, int *err, gchar **err_info)
* if we get an I/O error, "*err" will be set to a non-zero value and
* "*err_info will be set to null or an additional error string.
*
- * Leaves file handle at begining of line that contains the VMS Magic
+ * Leaves file handle at beginning of line that contains the VMS Magic
* identifier.
*/
static gboolean vms_check_file_type(wtap *wth, int *err, gchar **err_info)
@@ -200,9 +200,9 @@ static gboolean vms_check_file_type(wtap *wth, int *err, gchar **err_info)
char buf[VMS_LINE_LENGTH];
guint reclen, line;
gint64 mpos;
-
+
buf[VMS_LINE_LENGTH-1] = '\0';
-
+
for (line = 0; line < VMS_HEADER_LINES_TO_CHECK; line++) {
mpos = file_tell(wth->fh);
if (mpos == -1) {
@@ -215,14 +215,14 @@ static gboolean vms_check_file_type(wtap *wth, int *err, gchar **err_info)
*err = file_error(wth->fh, err_info);
return FALSE;
}
-
+
reclen = (guint) strlen(buf);
if (reclen < strlen(VMS_HDR_MAGIC_STR1) ||
- reclen < strlen(VMS_HDR_MAGIC_STR2) ||
+ reclen < strlen(VMS_HDR_MAGIC_STR2) ||
reclen < strlen(VMS_HDR_MAGIC_STR3)) {
continue;
}
-
+
if (strstr(buf, VMS_HDR_MAGIC_STR1) ||
strstr(buf, VMS_HDR_MAGIC_STR2) ||
strstr(buf, VMS_HDR_MAGIC_STR3)) {
@@ -376,7 +376,7 @@ parse_vms_rec_hdr(FILE_T fh, struct wtap_pkthdr *phdr, int *err, gchar **err_inf
/* Find text in line starting with "packet ". */
/* First look for the Format 1 type sequencing */
- num_items_scanned = sscanf(p,
+ num_items_scanned = sscanf(p,
"packet %9d at %2d-%3s-%4d %2d:%2d:%2d.%9d",
&pktnum, &tm.tm_mday, mon,
&tm.tm_year, &tm.tm_hour,