Remove some instances of _U_ where the parameter is now used.

svn path=/trunk/; revision=36148

diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c
index 5a55bb0e105611213393acd8b15b42741c4eff5c..d73a5fe529f665178dac43767157b67db3fbcf5f 100644 (file)
--- a/epan/dissectors/packet-pdcp-lte.c
+++ b/epan/dissectors/packet-pdcp-lte.c
@@ -840,11 +840,11 @@ static int dissect_pdcp_dynamic_chain(proto_tree *tree,
 
 
 
-static int dissect_pdcp_irdyn_packet(proto_tree *tree _U_,
+static int dissect_pdcp_irdyn_packet(proto_tree *tree,
                                      proto_item *root_item,
-                                     tvbuff_t *tvb _U_,
+                                     tvbuff_t *tvb,
                                      int offset,
-                                     struct pdcp_lte_info *p_pdcp_info _U_,
+                                     struct pdcp_lte_info *p_pdcp_info,
                                      packet_info *pinfo)
 {
     col_append_str(pinfo->cinfo, COL_INFO, " IRDYN");
@@ -1037,8 +1037,8 @@ static int dissect_pdcp_feedback_feedback2(proto_tree *tree,
                                            tvbuff_t *tvb,
                                            int offset,
                                            int size,
-                                           struct pdcp_lte_info *p_pdcp_info _U_,
-                                           packet_info *pinfo _U_)
+                                           struct pdcp_lte_info *p_pdcp_info,
+                                           packet_info *pinfo)
 {
     proto_item *ti;
     guint8  ack_type;
@@ -1223,7 +1223,7 @@ static int dissect_pdcp_r_0_packet(proto_tree *tree,
                                    proto_item *root_item,
                                    tvbuff_t *tvb,
                                    int offset,
-                                   struct pdcp_lte_info *p_pdcp_info _U_,
+                                   struct pdcp_lte_info *p_pdcp_info,
                                    packet_info *pinfo)
 {
     guint8 sn;

diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c
index dd60bc3fe63a0051ce6ddcaf827efdf0486dc3a9..686c22a3ab23b30b403c21addfbf0c706aff4cb7 100644 (file)
--- a/epan/dissectors/packet-rlc-lte.c
+++ b/epan/dissectors/packet-rlc-lte.c
@@ -1092,7 +1092,7 @@ static void checkChannelSequenceInfo(packet_info *pinfo, tvbuff_t *tvb,
 
 /* Add to the tree values associated with sequence analysis for this frame */
 static void addChannelRepeatedNACKInfo(rlc_channel_repeated_nack_report_in_frame *p,
-                                       rlc_lte_info *p_rlc_lte_info _U_,
+                                       rlc_lte_info *p_rlc_lte_info,
                                        packet_info *pinfo, proto_tree *tree,
                                        tvbuff_t *tvb)
 {
@@ -1250,7 +1250,7 @@ static void dissect_rlc_lte_tm(tvbuff_t *tvb, packet_info *pinfo,
                                proto_tree *tree,
                                int offset,
                                rlc_lte_info *p_rlc_lte_info,
-                               proto_item *top_ti _U_)
+                               proto_item *top_ti)
 {
     proto_item *raw_tm_ti;
     proto_item *tm_ti;

diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c
index 2425a8159dbd8dc74f10808663e5aa0d5ac7944e..42785362e1f112e03ed7d616cf54c1c50e4d9c1a 100644 (file)
--- a/epan/dissectors/packet-umts_fp.c
+++ b/epan/dissectors/packet-umts_fp.c
@@ -471,7 +471,7 @@ static void dissect_cpch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_t
 static void dissect_bch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
                                      int offset, struct fp_info *p_fp_info);
 static void dissect_iur_dsch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-                                          int offset, struct fp_info *p_fp_info _U_);
+                                          int offset, struct fp_info *p_fp_info);
 static void dissect_hsdsch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
                                         int offset, struct fp_info *p_fp_info);
 static void dissect_hsdsch_type_2_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
@@ -1901,7 +1901,7 @@ static void dissect_bch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tr
 /********************************/
 /* Dissect an IUR DSCH channel  */
 static void dissect_iur_dsch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-                                          int offset, struct fp_info *p_fp_info _U_)
+                                          int offset, struct fp_info *p_fp_info)
 {
     gboolean is_control_frame;
 
@@ -2636,8 +2636,8 @@ static void dissect_e_dch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_
 }
 
 /* Dissect the remainder of the T2 or common frame that differs from T1 */
-static void dissect_e_dch_t2_or_common_channel_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
-                                                    int offset, struct fp_info *p_fp_info _U_,
+static void dissect_e_dch_t2_or_common_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+                                                    int offset, struct fp_info *p_fp_info,
                                                     int number_of_subframes,
                                                     gboolean is_common)
 {