From 48be4e530d6635dbf1ef1dafa984c2060f3caa8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Mayer?= Date: Wed, 28 Aug 2002 20:41:00 +0000 Subject: Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6116 --- plugins/docsis/packet-docsis.c | 22 ++++++++++----------- plugins/docsis/packet-docsis.h | 8 ++++---- plugins/docsis/packet-map.c | 2 +- plugins/docsis/packet-tlv.c | 44 +++++++++++++++++++++--------------------- plugins/docsis/packet-tlv.h | 4 ++-- 5 files changed, 40 insertions(+), 40 deletions(-) (limited to 'plugins/docsis') diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c index 9eca311ddc..cc7ce7d963 100644 --- a/plugins/docsis/packet-docsis.c +++ b/plugins/docsis/packet-docsis.c @@ -2,7 +2,7 @@ * Routines for docsis dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-docsis.c,v 1.7 2002/08/20 22:44:25 guy Exp $ + * $Id: packet-docsis.c,v 1.8 2002/08/28 20:38:59 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -26,14 +26,14 @@ /* This code is based on the DOCSIS 1.1 specification available at: * http://www.cablemodem.com/specifications.html - * - * DOCSIS Captures can be facilitated using the Cable Monitor Feature + * + * DOCSIS Captures can be facilitated using the Cable Monitor Feature * available on Cisco Cable Modem Termination Systems : * http://www.cisco.com/univercd/cc/td/doc/product/cable/cab_rout/cmtsfg/ufg_cmon.htm * * This dissector depends on the presence of a DOCSIS enapsulation type. * There is no simple way to distinguish DOCSIS Frames from Ethernet frames, - * since the frames are copied from the RF interface on the CMTS to + * since the frames are copied from the RF interface on the CMTS to * a Fast Ethernet interface; Thus a preference was needed to enable * the DOCSIS encapsulation type. */ @@ -252,7 +252,7 @@ dissect_ehdr (tvbuff_t * tvb, proto_tree * tree, gboolean isfrag) FALSE); proto_tree_add_item (ehdr_tree, hf_docsis_mini_slots, tvb, pos + 4, 1, FALSE); - if (isfrag) + if (isfrag) { proto_tree_add_item (ehdr_tree, hf_docsis_frag_rsvd, tvb, pos+5, 1, FALSE); @@ -303,7 +303,7 @@ dissect_docsis (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) tvbuff_t *next_tvb, *mgt_tvb; guint16 pdulen, captured_length, framelen; gboolean isfrag = FALSE; - + /* Set up structures needed to add the protocol subtree and manage it */ proto_item *ti; proto_tree *docsis_tree; @@ -488,7 +488,7 @@ dissect_docsis (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) } } - if ((fctype == FCTYPE_PACKET) && (pdulen == 0)) + if ((fctype == FCTYPE_PACKET) && (pdulen == 0)) { if (concatlen > 0) { @@ -514,7 +514,7 @@ dissect_docsis (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) /* Don't do anything for a Request Frame */ break; case 0x03: - /* For Fragmentation Frames simply dissect using the data + /* For Fragmentation Frames simply dissect using the data * dissector as we don't handle them yet */ mgt_tvb = tvb_new_subset (tvb, hdrlen, captured_length, pdulen); @@ -526,10 +526,10 @@ dissect_docsis (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) } break; case 0x1c: - /* call the docsis dissector on the same frame + /* call the docsis dissector on the same frame * to dissect DOCSIS frames within the concatenated - * frame. concatpos and concatlen are declared - * static and are decremented and incremented + * frame. concatpos and concatlen are declared + * static and are decremented and incremented * respectively when the inner * docsis frames are dissected. */ while (concatlen > 0) diff --git a/plugins/docsis/packet-docsis.h b/plugins/docsis/packet-docsis.h index 8cc82a6e1e..cc8f61303c 100644 --- a/plugins/docsis/packet-docsis.h +++ b/plugins/docsis/packet-docsis.h @@ -1,21 +1,21 @@ /* packet-docsis.h * - * $Id: packet-docsis.h,v 1.2 2002/08/02 22:04:13 jmayer Exp $ + * $Id: packet-docsis.h,v 1.3 2002/08/28 20:38:59 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/plugins/docsis/packet-map.c b/plugins/docsis/packet-map.c index d2fb6467a3..0bbacff598 100644 --- a/plugins/docsis/packet-map.c +++ b/plugins/docsis/packet-map.c @@ -155,7 +155,7 @@ dissect_map (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) proto_tree_add_item_hidden(map_tree, hf_docsis_map_sid, tvb, pos, 4, FALSE); proto_tree_add_item_hidden(map_tree, hf_docsis_map_iuc, tvb, pos, 4, FALSE); proto_tree_add_item_hidden(map_tree, hf_docsis_map_offset, tvb, pos, 4, FALSE); - if (sid == 0x3FFF) + if (sid == 0x3FFF) proto_tree_add_uint_format (map_tree, hf_docsis_map_ie, tvb, pos, 4, ie, "SID = 0x%x (All CM's), IUC = %s, Offset = %u", sid, val_to_str (iuc, iuc_vals, "%s"), diff --git a/plugins/docsis/packet-tlv.c b/plugins/docsis/packet-tlv.c index 314b8a5de4..5bf4199143 100644 --- a/plugins/docsis/packet-tlv.c +++ b/plugins/docsis/packet-tlv.c @@ -42,7 +42,7 @@ /* This module will dissect the Appendix C TLV's. Please see: * http://www.cablemodem.com/specifications.html * - * The main dissector is dissect_tlv. This routine will dissect + * The main dissector is dissect_tlv. This routine will dissect * top level TLV's and call sub-dissectors for the sub-TLV's. */ @@ -1725,17 +1725,17 @@ dissect_svc_unavail(tvbuff_t * tvb, proto_tree * tree, guint16 pos, guint16 leng proto_item *svc_unavail_it; proto_tree *svc_unavail_tree; - svc_unavail_it = proto_tree_add_item (tree, - hf_docsis_tlv_svc_unavail, + svc_unavail_it = proto_tree_add_item (tree, + hf_docsis_tlv_svc_unavail, tvb, pos, length, FALSE); svc_unavail_tree = proto_item_add_subtree(svc_unavail_it, ett_docsis_tlv_svc_unavail ); - proto_tree_add_item (svc_unavail_tree, + proto_tree_add_item (svc_unavail_tree, hf_docsis_tlv_svc_unavail_classid, tvb, pos, 1, FALSE); - proto_tree_add_item (svc_unavail_tree, + proto_tree_add_item (svc_unavail_tree, hf_docsis_tlv_svc_unavail_type, tvb, pos+1, 1, FALSE); - proto_tree_add_item (svc_unavail_tree, + proto_tree_add_item (svc_unavail_tree, hf_docsis_tlv_svc_unavail_code, tvb, pos+2, 1, FALSE); @@ -1748,22 +1748,22 @@ dissect_snmpv3_kickstart(tvbuff_t * tvb, proto_tree *tree, guint16 start, guint1 guint8 type, length; guint16 pos = start; - snmpv3_it = proto_tree_add_item (tree, - hf_docsis_tlv_snmpv3_kick, + snmpv3_it = proto_tree_add_item (tree, + hf_docsis_tlv_snmpv3_kick, tvb, start, len, FALSE); snmpv3_tree = proto_item_add_subtree(snmpv3_it, ett_docsis_tlv_snmpv3_kick); - + while (pos < (start + len)) { type = tvb_get_guint8 (tvb, pos++); length = tvb_get_guint8 (tvb, pos++); switch (type) { case SNMPV3_SEC_NAME: - proto_tree_add_item (snmpv3_tree, + proto_tree_add_item (snmpv3_tree, hf_docsis_tlv_snmpv3_kick_name, tvb, pos, length, FALSE); break; case SNMPV3_MGR_PUB_NUM: - proto_tree_add_item (snmpv3_tree, + proto_tree_add_item (snmpv3_tree, hf_docsis_tlv_snmpv3_kick_publicnum, tvb, pos, length, FALSE); break; @@ -1800,7 +1800,7 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree) { case TLV_DOWN_FREQ: /* This is ugly. There are multiple type 1 TLV's that may appear - * in the TLV data, the problem is that they are dependent on + * in the TLV data, the problem is that they are dependent on * message type. */ if (length == 4) proto_tree_add_item (tlv_tree, hf_docsis_tlv_down_freq, tvb, @@ -1877,11 +1877,11 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree) length, FALSE); break; case TLV_SNMP_WRITE_CTRL: - proto_tree_add_item (tlv_tree, hf_docsis_tlv_snmp_access, tvb, + proto_tree_add_item (tlv_tree, hf_docsis_tlv_snmp_access, tvb, pos, length, FALSE); break; case TLV_SNMP_OBJECT: - proto_tree_add_item (tlv_tree, hf_docsis_tlv_snmp_obj, tvb, + proto_tree_add_item (tlv_tree, hf_docsis_tlv_snmp_obj, tvb, pos, length, FALSE); break; case TLV_MODEM_IP: @@ -1896,7 +1896,7 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree) } break; case TLV_SVC_UNAVAIL: - if (length == 3) + if (length == 3) { dissect_svc_unavail(tvb, tlv_tree, pos, length); } @@ -1980,7 +1980,7 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree) dissect_phs (tvb, tlv_tree, pos, length); break; case TLV_HMAC_DIGEST: - if (length == 20) + if (length == 20) { proto_tree_add_item (tlv_tree, hf_docsis_tlv_hmac_digest, tvb, @@ -2045,24 +2045,24 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree) tvb, pos, length, FALSE); break; case TLV_SUBS_MGMT_CPE: - if ((length % 4) == 0) + if ((length % 4) == 0) { proto_tree_add_item (tlv_tree, hf_docsis_tlv_subs_mgmt_ip_table, tvb, pos, length, FALSE); - for (x = 0; x < length; x+=4) + for (x = 0; x < length; x+=4) { - proto_tree_add_item (tlv_tree, + proto_tree_add_item (tlv_tree, hf_docsis_tlv_subs_mgmt_ip_entry, tvb, pos + x, 4, FALSE); } - } + } else - { + { THROW (ReportedBoundsError); } break; case TLV_SUBS_MGMT_FLTR: - proto_tree_add_item (tlv_tree, + proto_tree_add_item (tlv_tree, hf_docsis_tlv_subs_mgmt_filter_grps, tvb, pos, length, FALSE); break; diff --git a/plugins/docsis/packet-tlv.h b/plugins/docsis/packet-tlv.h index 5c0dee9432..3e34cb39f0 100644 --- a/plugins/docsis/packet-tlv.h +++ b/plugins/docsis/packet-tlv.h @@ -67,7 +67,7 @@ #define TLV_VENDOR_SPEC 43 #define TLV_END 255 -/* Define DOCSIS 1.0 Class Of Service Configuration Types +/* Define DOCSIS 1.0 Class Of Service Configuration Types * These are subtypes of TLV_COS (4) */ #define COS_CLASSID 1 @@ -193,7 +193,7 @@ #define SFW_MAX_DOWN_LAT 14 /* Define Service Flow Error sub-subtypes - * These are subtypes of + * These are subtypes of * SFW_ERRORS ([24/25].5) */ #define SFW_ERR_PARAM 1 -- cgit v1.2.3