Stop gcc warning about type-punned pointer breaks strict anti-aliasing
authorsfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 10 Jan 2011 21:23:25 +0000 (21:23 +0000)
committersfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 10 Jan 2011 21:23:25 +0000 (21:23 +0000)
rules.  (Is this the right fix?  I had to remove a now meaningless
comparison of psm > 0x1000 (4096) since psm is now a guint8 not a guint16.)

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

epan/dissectors/packet-btsdp.c

index 0a8c459c3904832ee0e5cc36b5e78bcd5320bf67..d969d5cc09248d34ce419d4898d27375e7e1d64f 100644 (file)
@@ -569,11 +569,11 @@ dissect_sdp_service_attribute(proto_tree *tree, tvbuff_t *tvb, int offset, packe
                                service_item->service = service;
                        }
                        else if(id == 0x200) { /* GOEP L2CAP PSM? */
-                               guint16 *psm;
+                               guint8 *psm;
 
-                               get_sdp_type(tvb, offset+ 3, id, &type, (guint8 **) &psm,  &service, &service_val);
+                               get_sdp_type(tvb, offset+ 3, id, &type, &psm,  &service, &service_val);
 
-                               if( (type == 1) && (*psm > 0x1000) && (*psm & 0x1) ) {
+                               if( (type == 1) && (*psm & 0x1) ) {
                                        service_item->channel = *psm;
                                        service_item->protocol = BTSDP_L2CAP_PROTOCOL_UUID;
                                        service_item->flags = 0;