From 2f9dfbce45adf7492b82b6f0fffff45916a2d41e Mon Sep 17 00:00:00 2001 From: Bill Meier Date: Sun, 23 Oct 2011 17:10:59 +0000 Subject: [PATCH] (Trivial) Whitespace cleanup. svn path=/trunk/; revision=39513 --- epan/dissectors/packet-bootp.c | 18 +++++++++--------- epan/dissectors/packet-rdp.c | 22 +++++++++++----------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c index 4ca3d88853..4da61e37c3 100644 --- a/epan/dissectors/packet-bootp.c +++ b/epan/dissectors/packet-bootp.c @@ -1368,9 +1368,9 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff, const guchar *dns_name; gboolean option_handled = TRUE; struct basic_types_hfs default_hfs = {&hf_bootp_option_value, &hf_bootp_option_value_ip_address, &hf_bootp_option_value_ip_address, - &hf_bootp_option_value_stringz, &hf_bootp_option_value_boolean, &hf_bootp_option_value_8, - &hf_bootp_option_value_16, &hf_bootp_option_value_16, - &hf_bootp_option_value_u32, &hf_bootp_option_value_i32, &hf_bootp_option_value_u32 }; + &hf_bootp_option_value_stringz, &hf_bootp_option_value_boolean, &hf_bootp_option_value_8, + &hf_bootp_option_value_16, &hf_bootp_option_value_16, + &hf_bootp_option_value_u32, &hf_bootp_option_value_i32, &hf_bootp_option_value_u32 }; /* Options whose length isn't "optlen + 2". */ switch (code) { @@ -2302,7 +2302,7 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff, } basictype_consumed = bootp_handle_basic_types(pinfo, v_tree, vti, tvb, ftype, - optoff, optlen, opt->phf, &default_hfs); + optoff, optlen, opt->phf, &default_hfs); if ((basictype_consumed == 0) && (option_handled == FALSE) && (opt->phf == NULL) && (optlen > 0)) { @@ -2340,8 +2340,8 @@ bootp_dhcp_decode_agent_info(packet_info *pinfo, proto_item *v_ti, proto_tree *v proto_tree *o82_v_tree, *o82_9_tree; guint8 tag, tag_len; struct basic_types_hfs default_hfs = {&hf_bootp_option82_value, &hf_bootp_option82_value_ip_address, &hf_bootp_option82_value_ip_address, - &hf_bootp_option82_value_stringz, NULL, &hf_bootp_option82_value_8, - NULL, NULL, &hf_bootp_option82_value_32, NULL, NULL}; + &hf_bootp_option82_value_stringz, NULL, &hf_bootp_option82_value_8, + NULL, NULL, &hf_bootp_option82_value_32, NULL, NULL}; static struct opt_info o82_opt[]= { /* 0 */ {"nop", bytes, &hf_bootp_option82_padding}, /* dummy */ @@ -2454,7 +2454,7 @@ bootp_dhcp_decode_agent_info(packet_info *pinfo, proto_item *v_ti, proto_tree *v } else { if (bootp_handle_basic_types(pinfo, o82_v_tree, vti, tvb, o82_opt[subopt].ftype, - suboptoff, subopt_len, o82_opt[subopt].phf, &default_hfs) == 0) { + suboptoff, subopt_len, o82_opt[subopt].phf, &default_hfs) == 0) { expert_add_info_format(pinfo, vti, PI_PROTOCOL, PI_ERROR, "ERROR, please report: Unknown subopt type handler %d", subopt); } } @@ -3171,8 +3171,8 @@ dissect_vendor_cl_suboption(packet_info *pinfo, proto_item *v_ti, proto_tree *v_ proto_tree *o125_v_tree; proto_item *vti; struct basic_types_hfs default_hfs = {&hf_bootp_option125_value, &hf_bootp_option125_value_ip_address, &hf_bootp_option125_value_ip_address, - &hf_bootp_option125_value_stringz, NULL, &hf_bootp_option125_value_8, - &hf_bootp_option125_value_16, NULL, NULL, NULL, NULL}; + &hf_bootp_option125_value_stringz, NULL, &hf_bootp_option125_value_8, + &hf_bootp_option125_value_16, NULL, NULL, NULL, NULL}; static struct opt_info o125_cl_opt[]= { /* 0 */ {"nop", special, NULL}, /* dummy */ diff --git a/epan/dissectors/packet-rdp.c b/epan/dissectors/packet-rdp.c index 9cdece362e..88f2d02bb5 100644 --- a/epan/dissectors/packet-rdp.c +++ b/epan/dissectors/packet-rdp.c @@ -833,8 +833,8 @@ dissect_rdp_fields(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr REPORT_DISSECTOR_BUG("Error!!!!!\n"); if(c->flags & RDP_FI_UNICODE) { - string = tvb_get_ephemeral_faked_unicode(tvb, offset, len/2, TRUE); \ - proto_item_append_text(pi, " (%s)", string); \ + string = tvb_get_ephemeral_faked_unicode(tvb, offset, len/2, TRUE); + proto_item_append_text(pi, " (%s)", string); } if(c->flags & RDP_FI_SUBTREE) { @@ -1437,7 +1437,7 @@ dissect_rdp_SendData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { switch(flags & SEC_PKT_MASK) { case SEC_EXCHANGE_PKT: - pi = proto_tree_add_item(tree, hf_rdp_securityExchangePDU, tvb, offset, length, ENC_NA); \ + pi = proto_tree_add_item(tree, hf_rdp_securityExchangePDU, tvb, offset, length, ENC_NA); next_tree = proto_item_add_subtree(pi, ett_rdp_securityExchangePDU); col_append_sep_str(pinfo->cinfo, COL_INFO, " ", "SecurityExchange"); @@ -1668,7 +1668,7 @@ dissect_rdp_ClientData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(tvb_length_remaining(tvb, offset) >= length) { - pi = proto_tree_add_item(tree, hf_rdp_clientCoreData, tvb, offset, length, ENC_NA); \ + pi = proto_tree_add_item(tree, hf_rdp_clientCoreData, tvb, offset, length, ENC_NA); next_tree = proto_item_add_subtree(pi, ett_rdp_clientCoreData); offset = dissect_rdp_fields(tvb, offset, pinfo, next_tree, core_fields); @@ -1681,7 +1681,7 @@ dissect_rdp_ClientData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { case CS_SECURITY: if(tvb_length_remaining(tvb, offset) >= length) { - pi = proto_tree_add_item(tree, hf_rdp_clientSecurityData, tvb, offset, length, ENC_NA); \ + pi = proto_tree_add_item(tree, hf_rdp_clientSecurityData, tvb, offset, length, ENC_NA); next_tree = proto_item_add_subtree(pi, ett_rdp_clientSecurityData); @@ -1708,7 +1708,7 @@ dissect_rdp_ClientData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { case CS_CLUSTER: if(tvb_length_remaining(tvb, offset) >= length) { - pi = proto_tree_add_item(tree, hf_rdp_clientClusterData, tvb, offset, length, ENC_NA); \ + pi = proto_tree_add_item(tree, hf_rdp_clientClusterData, tvb, offset, length, ENC_NA); next_tree = proto_item_add_subtree(pi, ett_rdp_clientClusterData); @@ -1722,7 +1722,7 @@ dissect_rdp_ClientData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { default: if(tvb_length_remaining(tvb, offset) >= length) { - pi = proto_tree_add_item(tree, hf_rdp_clientUnknownData, tvb, offset, length, ENC_NA); \ + pi = proto_tree_add_item(tree, hf_rdp_clientUnknownData, tvb, offset, length, ENC_NA); next_tree = proto_item_add_subtree(pi, ett_rdp_clientUnknownData); @@ -1849,7 +1849,7 @@ dissect_rdp_ServerData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(tvb_length_remaining(tvb, offset) >= length) { - pi = proto_tree_add_item(tree, hf_rdp_serverCoreData, tvb, offset, length, ENC_NA); \ + pi = proto_tree_add_item(tree, hf_rdp_serverCoreData, tvb, offset, length, ENC_NA); next_tree = proto_item_add_subtree(pi, ett_rdp_serverCoreData); offset = dissect_rdp_fields(tvb, offset, pinfo, next_tree, sc_fields); @@ -1862,7 +1862,7 @@ dissect_rdp_ServerData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { case SC_SECURITY: if(tvb_length_remaining(tvb, offset) >= length) { - pi = proto_tree_add_item(tree, hf_rdp_serverSecurityData, tvb, offset, length, ENC_NA); \ + pi = proto_tree_add_item(tree, hf_rdp_serverSecurityData, tvb, offset, length, ENC_NA); next_tree = proto_item_add_subtree(pi, ett_rdp_serverSecurityData); @@ -1889,7 +1889,7 @@ dissect_rdp_ServerData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { case SC_NET: if(tvb_length_remaining(tvb, offset) >= length) { - pi = proto_tree_add_item(tree, hf_rdp_serverNetworkData, tvb, offset, length, ENC_NA); \ + pi = proto_tree_add_item(tree, hf_rdp_serverNetworkData, tvb, offset, length, ENC_NA); next_tree = proto_item_add_subtree(pi, ett_rdp_serverNetworkData); @@ -1929,7 +1929,7 @@ dissect_rdp_ServerData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { default: if(tvb_length_remaining(tvb, offset) >= length) { - pi = proto_tree_add_item(tree, hf_rdp_serverUnknownData, tvb, offset, length, ENC_NA); \ + pi = proto_tree_add_item(tree, hf_rdp_serverUnknownData, tvb, offset, length, ENC_NA); next_tree = proto_item_add_subtree(pi, ett_rdp_serverUnknownData);