diff options
| author | Stephen Fisher <steve@stephen-fisher.com> | 2011-01-10 21:23:25 +0000 |
|---|---|---|
| committer | Stephen Fisher <steve@stephen-fisher.com> | 2011-01-10 21:23:25 +0000 |
| commit | fe06217c35c628a1615003b45afda84c66e41057 (patch) | |
| tree | c7da5b590fe18f20401d869fdd60c934b0a19561 /epan/dissectors | |
| parent | 1b4d847a90a535e3cdfa54ea8d4d81294e6faec8 (diff) | |
Stop gcc warning about type-punned pointer breaks strict anti-aliasing
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.)
svn path=/trunk/; revision=35463
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-btsdp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index 0a8c459c39..d969d5cc09 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -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; |