diff options
author | Bill Meier <wmeier@newsguy.com> | 2014-02-25 15:42:35 -0500 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2014-02-25 20:46:49 +0000 |
commit | 11b5c15fdb815a2af400bfddef944dbac41a434a (patch) | |
tree | e7217ebcff4d4d9f7f95d0342b6776547e5537c3 /plugins/wimax | |
parent | c55c57ad72acda8cbce2841bc237f966bad5ae5b (diff) |
Remove trailing whitespace
Change-Id: I8116f63ff88687c8db3fd6e8e23b22ab2f759af0
Reviewed-on: https://code.wireshark.org/review/385
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'plugins/wimax')
-rw-r--r-- | plugins/wimax/crc.c | 30 | ||||
-rw-r--r-- | plugins/wimax/crc_data.c | 64 | ||||
-rw-r--r-- | plugins/wimax/mac_mgmt_msg_decoder.c | 2 | ||||
-rw-r--r-- | plugins/wimax/msg_dsa.c | 2 | ||||
-rw-r--r-- | plugins/wimax/msg_dsd.c | 10 | ||||
-rw-r--r-- | plugins/wimax/msg_reg_req.c | 2 | ||||
-rw-r--r-- | plugins/wimax/msg_rng_rsp.c | 6 |
7 files changed, 58 insertions, 58 deletions
diff --git a/plugins/wimax/crc.c b/plugins/wimax/crc.c index b2dc4090dd..cd169c2725 100644 --- a/plugins/wimax/crc.c +++ b/plugins/wimax/crc.c @@ -47,11 +47,11 @@ extern guint16 crc16_table[256]; DESCRIPTION: Generate the table of CRC remainders for all possible bytes - + ARGS: RETURNS: - + SIDE EFFECTS: */ @@ -62,16 +62,16 @@ void wimax_mac_gen_crc32_table(void) /* little-endian (reflected) algorithm */ for ( index = 0; index < G_N_ELEMENTS(crc32_table); index++ ) - { + { crc = ( index << 24 ); for ( bit = 0; bit < 8; bit++ ) { if ( crc & 0x80000000U ) crc = ( crc << 1 ) ^ WMAX_MAC_CRC32_POLYNOMIAL; else - crc = ( crc << 1 ); + crc = ( crc << 1 ); } - crc32_table[index] = crc; + crc32_table[index] = crc; } } @@ -94,18 +94,18 @@ void wimax_mac_gen_crc8_table(void) { guint index, bit; guint8 crc; - + for ( index = 0; index < G_N_ELEMENTS(crc8_table); index++ ) - { + { crc = index; for ( bit = 0; bit < 8; bit++ ) { if ( crc & 0x80 ) crc = ( crc << 1 ) ^ WMAX_MAC_CRC8_POLYNOMIAL; else - crc = ( crc << 1 ); + crc = ( crc << 1 ); } - crc8_table[index] = crc; + crc8_table[index] = crc; } } #endif @@ -122,7 +122,7 @@ void wimax_mac_gen_crc8_table(void) data_len - length of data (in bytes) RETURNS: calculated crc32 - + SIDE EFFECTS: */ @@ -132,9 +132,9 @@ guint32 wimax_mac_calc_crc32(const guint8 *data, guint data_len) guint i, j; for ( j = 0; j < data_len; j++ ) - { + { i = ( (guint8)(crc>>24) ^ data[j] ) & 0xff; - crc = ( crc<<8 ) ^ crc32_table[i]; + crc = ( crc<<8 ) ^ crc32_table[i]; } return ~crc; } @@ -151,7 +151,7 @@ guint32 wimax_mac_calc_crc32(const guint8 *data, guint data_len) data_len - length of data (in bytes) RETURNS: calculated crc16 - + SIDE EFFECTS: */ @@ -161,7 +161,7 @@ guint16 wimax_mac_calc_crc16(const guint8 *data, guint data_len) guint j; for ( j = 0; j < data_len; j++ ) - { + { crc ^= data[j] << 8; crc = (crc << 8) ^ crc16_table[(crc & 0xff00) >> 8]; } @@ -182,7 +182,7 @@ guint16 wimax_mac_calc_crc16(const guint8 *data, guint data_len) data_len - length of data (in bytes) RETURNS: calculated crc8 - + SIDE EFFECTS: */ diff --git a/plugins/wimax/crc_data.c b/plugins/wimax/crc_data.c index f97774a4c6..e02411ba08 100644 --- a/plugins/wimax/crc_data.c +++ b/plugins/wimax/crc_data.c @@ -137,37 +137,37 @@ guint8 hcs_table[256] = { #endif guint16 crc16_table[256] = { - 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, - 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, - 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, - 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de, - 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, - 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, - 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4, - 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, - 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823, - 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, - 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, - 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, - 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, - 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, - 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70, - 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, - 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, - 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067, - 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, - 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, - 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d, - 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, - 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c, - 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, - 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab, - 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3, - 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, - 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92, - 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, - 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1, - 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8, - 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0, + 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, + 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, + 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, + 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de, + 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, + 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, + 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4, + 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, + 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823, + 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, + 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, + 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, + 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, + 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, + 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70, + 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, + 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, + 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067, + 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, + 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, + 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d, + 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, + 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c, + 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, + 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab, + 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3, + 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, + 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92, + 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, + 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1, + 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8, + 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0, }; diff --git a/plugins/wimax/mac_mgmt_msg_decoder.c b/plugins/wimax/mac_mgmt_msg_decoder.c index 0ff2cefc50..d505692449 100644 --- a/plugins/wimax/mac_mgmt_msg_decoder.c +++ b/plugins/wimax/mac_mgmt_msg_decoder.c @@ -161,7 +161,7 @@ static void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, prot proto_item_append_text(proto_tree_get_parent(tree), ", %s", mgt_msg_str); /* Decode and display the MAC payload */ - if (!dissector_try_uint(subdissector_message_table, message_type, + if (!dissector_try_uint(subdissector_message_table, message_type, tvb_new_subset_remaining(tvb, 1), pinfo, tree)) { proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, -1, ENC_NA); diff --git a/plugins/wimax/msg_dsa.c b/plugins/wimax/msg_dsa.c index b781f9fe9a..a80c368bcf 100644 --- a/plugins/wimax/msg_dsa.c +++ b/plugins/wimax/msg_dsa.c @@ -61,7 +61,7 @@ static void dissect_mac_mgmt_msg_dsa_req_decoder(tvbuff_t *tvb, packet_info *pin { /* we are being asked for details */ /* display MAC message type */ - dsa_item = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_dsa_decoder, tvb, offset, -1, + dsa_item = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_dsa_decoder, tvb, offset, -1, "Dynamic Service Addition Request (DSA-REQ)"); /* add MAC DSx subtree */ dsa_tree = proto_item_add_subtree(dsa_item, ett_mac_mgmt_msg_dsa_req_decoder); diff --git a/plugins/wimax/msg_dsd.c b/plugins/wimax/msg_dsd.c index 7f2a494aa2..79338b01fa 100644 --- a/plugins/wimax/msg_dsd.c +++ b/plugins/wimax/msg_dsd.c @@ -209,35 +209,35 @@ void proto_register_mac_mgmt_msg_dsd(void) { &hf_dsd_confirmation_code, { - "Confirmation code", "wmx.dsd.confirmation_code", + "Confirmation code", "wmx.dsd.confirmation_code", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_dsd_service_flow_id, { - "Service Flow ID", "wmx.dsd.service_flow_id", + "Service Flow ID", "wmx.dsd.service_flow_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_dsd_transaction_id, { - "Transaction ID", "wmx.dsd.transaction_id", + "Transaction ID", "wmx.dsd.transaction_id", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_dsd_invalid_tlv, { - "Invalid TLV", "wmx.dsd.invalid_tlv", + "Invalid TLV", "wmx.dsd.invalid_tlv", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_dsd_unknown_type, { - "Unknown type", "wmx.dsd.unknown_type", + "Unknown type", "wmx.dsd.unknown_type", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } } diff --git a/plugins/wimax/msg_reg_req.c b/plugins/wimax/msg_reg_req.c index c8093d4052..a2a50739de 100644 --- a/plugins/wimax/msg_reg_req.c +++ b/plugins/wimax/msg_reg_req.c @@ -259,7 +259,7 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb case REG_UL_TRANSPORT_CIDS_SUPPORTED: add_tlv_subtree(&tlv_info, reg_req_tree, hf_reg_ul_cids, tvb, offset, ENC_BIG_ENDIAN); break; - + case REG_POWER_SAVING_CLASS_CAPABILITY: tlv_item = add_tlv_subtree(&tlv_info, reg_req_tree, hf_reg_power_saving_class_capability, tvb, offset, ENC_BIG_ENDIAN); tlv_tree = proto_item_add_subtree(tlv_item, ett_mac_mgmt_msg_reg_req_decoder); diff --git a/plugins/wimax/msg_rng_rsp.c b/plugins/wimax/msg_rng_rsp.c index fab1caece7..27602152a2 100644 --- a/plugins/wimax/msg_rng_rsp.c +++ b/plugins/wimax/msg_rng_rsp.c @@ -513,11 +513,11 @@ static void dissect_mac_mgmt_msg_rng_rsp_decoder(tvbuff_t *tvb, packet_info *pin add_tlv_subtree(&tlv_info, rng_rsp_tree, hf_tlv_type, tvb, offset, ENC_NA); } break; - + default: add_tlv_subtree(&tlv_info, rng_rsp_tree, hf_tlv_type, tvb, offset, ENC_NA); break; - + } offset = tlv_len + tlv_offset; } /* end of TLV process while loop */ @@ -752,7 +752,7 @@ void proto_register_mac_mgmt_msg_rng_rsp(void) { &hf_rng_invalid_tlv, { - "Invalid TLV", "wmx.rng_rsp.invalid_tlv", + "Invalid TLV", "wmx.rng_rsp.invalid_tlv", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, |