diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-04-22 03:34:39 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-04-22 03:34:39 +0000 |
| commit | 9fd4d4638aa617ca1029caa11cccdb03a1e2d70f (patch) | |
| tree | b9c604c8df0aafc9e6416f581c9754147a849eaf /epan/dissectors/packet-ieee802154.c | |
| parent | 277ec4e420553cd8e97c3b15223c3d4136e358b8 (diff) | |
Stuff that comes back from ep_alloc() is properly aligned for all uses;
that's why it returns "void *", not "guint8 *". Don't pointer-convert
that information away; otherwise, compilers might whine at you about
unsafe casts.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36793 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-ieee802154.c')
| -rw-r--r-- | epan/dissectors/packet-ieee802154.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 0a8fcb3719..cf8f2e520d 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -777,7 +777,7 @@ dissect_ieee802154_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g } else if (packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT) { /* Dynamic (not stack) memory required for address column. */ - gchar *addr = ep_alloc(8); + void *addr = ep_alloc(8); gchar *dst, *dst_oui; /* Get the address */ @@ -897,7 +897,7 @@ dissect_ieee802154_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g } else if (packet->src_addr_mode == IEEE802154_FCF_ADDR_EXT) { /* Dynamic (not stack) memory required for address column. */ - gchar *addr = ep_alloc(8); + void *addr = ep_alloc(8); gchar *src, *src_oui; /* Get the address. */ |