Fix various warnings found by clang 3.0 (trunk 129935) complier:

- Extraneous parentheses

- Use _U_ for unused function parameters instead of assigning the variable
  to itself 



git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36826 f5534014-38df-0310-8fa8-9805f1628bb7

4 files changed, 5 insertions, 7 deletions

diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c
index e297c2d0b0..2e09802f4f 100644
--- a/epan/dissectors/packet-sbus.c
+++ b/epan/dissectors/packet-sbus.c
@@ -1696,7 +1696,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
                                    /* Response: Read system infomation (without interpretation of module info)*/
                             case SBUS_RD_SYSTEM_INFORMATION:
-                                   if (((request_val->sysinfo) == 0x00)){ /*sysinfo 0*/
+                                   if (request_val->sysinfo == 0x00){ /*sysinfo 0*/
                                           offset += 1; /* this byte is always 0x01*/
                                           /*Add subtree for Data*/
                                           dt = proto_tree_add_text(sbus_tree, tvb, offset,
diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c
index 349e3d7051..ad3a69316c 100644
--- a/epan/dissectors/packet-srvloc.c
+++ b/epan/dissectors/packet-srvloc.c
@@ -401,9 +401,8 @@ dissect_authblk_v2(tvbuff_t *tvb, int offset, proto_tree *tree)
 }
 
 static int
-dissect_attrauthblk_v2(tvbuff_t *tvb, int offset, proto_tree *tree)
+dissect_attrauthblk_v2(tvbuff_t *tvb _U_, int offset, proto_tree *tree _U_)
 {
-    tvb=tvb; tree=tree; /* silence gcc for now */
     /* add code in here to handle attribute authentication */
     return offset;
 }
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index 9d4c5bd77e..7e99f9af6f 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -584,8 +584,7 @@ scan_for_next_pdu(tvbuff_t *tvb, proto_tree *tcp_tree, packet_info *pinfo, int o
          */
         msp=se_tree_lookup32_le(multisegment_pdus, nxtseq-1);
         if(msp){
-            if( (pinfo->fd->num==msp->first_frame)
-            ){
+            if(pinfo->fd->num==msp->first_frame) {
                 proto_item *item;
                 nstime_t ns;
 
diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c
index b453160416..c71f6068b1 100644
--- a/epan/dissectors/packet-xml.c
+++ b/epan/dissectors/packet-xml.c
@@ -246,7 +246,7 @@ xml_frame_t *xml_get_tag(xml_frame_t *frame, const gchar *name) {
 
 	xml_frame_t *xml_item = frame->first_child;
 	while (xml_item) {
-		if ((xml_item->type == XML_FRAME_TAG)) {
+		if (xml_item->type == XML_FRAME_TAG) {
 			if (!name) {  /* get the 1st tag */
 	        	tag = xml_item;
 				break;
@@ -282,7 +282,7 @@ xml_frame_t *xml_get_cdata(xml_frame_t *frame) {
 
 	xml_frame_t *xml_item = frame->first_child;
 	while (xml_item) {
-		if ((xml_item->type == XML_FRAME_CDATA)) {
+		if (xml_item->type == XML_FRAME_CDATA) {
         	cdata = xml_item;
 			break;
 		}