diff options
author | Bill Meier <wmeier@newsguy.com> | 2013-02-26 04:42:26 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2013-02-26 04:42:26 +0000 |
commit | 96a24cc79f7a32851cc2005603e32633389043a3 (patch) | |
tree | 62c91332176b091409c8f06937bbce734155981e /asn1 | |
parent | a6e56df8b683bb696655c331f64f22abc8f36af4 (diff) |
Fix spelling/typos found using a list of commonly misspelled words.
The misspellings were mostly in comments but some were
in text strings visible to the user.
svn path=/trunk/; revision=47899
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/cmp/packet-cmp-template.c | 2 | ||||
-rw-r--r-- | asn1/h225/packet-h225-template.c | 4 | ||||
-rw-r--r-- | asn1/h450/packet-h450-template.c | 46 | ||||
-rw-r--r-- | asn1/isdn-sup/packet-isdn-sup-template.c | 8 | ||||
-rw-r--r-- | asn1/ldap/packet-ldap-template.c | 4 | ||||
-rw-r--r-- | asn1/nbap/packet-nbap-template.c | 8 | ||||
-rw-r--r-- | asn1/qsig/packet-qsig-template.c | 4 |
7 files changed, 38 insertions, 38 deletions
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]; |