diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-06 14:25:47 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-06 14:25:47 +0000 |
| commit | 8c48c6835fbfada96d2197bcbc7a87023bfc8291 (patch) | |
| tree | 2a60509a6637549f370b63ce3b27a3de8f9736d8 /epan/dissectors/packet-ieee802154.c | |
| parent | d6b920b8f6b22548e3828258ea11b2443af89ce4 (diff) | |
Rename address_to_str() to ep_address_to_str() because:
1) This indicates that the string has ephemeral lifetime
2) More consistent with its existing seasonal counterpart, se_address_to_str().
svn path=/trunk/; revision=29747
Diffstat (limited to 'epan/dissectors/packet-ieee802154.c')
| -rw-r--r-- | epan/dissectors/packet-ieee802154.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 26388faf30..d085b34e4a 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -281,7 +281,7 @@ print_eui64(guint64 addr) eui64addr.len = sizeof(guint64); eui64addr.data = &addr; /* Print the address. */ - return address_to_str(&eui64addr); + return ep_address_to_str(&eui64addr); } /* print_eui64 */ /*FUNCTION:------------------------------------------------------ @@ -313,7 +313,7 @@ print_eui64_oui(guint64 addr) manuf_name = get_manuf_name_if_known(eui64addr.data); if (manuf_name == NULL) { /* Could not find an OUI. */ - return address_to_str(&eui64addr); + return ep_address_to_str(&eui64addr); } else { /* Found an address string. */ @@ -1778,7 +1778,7 @@ void proto_register_ieee802154(void) proto_register_subtree_array(ett, array_length(ett)); /* add a user preference to set the 802.15.4 ethertype */ - ieee802154_module = prefs_register_protocol(proto_ieee802154, + ieee802154_module = prefs_register_protocol(proto_ieee802154, proto_reg_handoff_ieee802154); prefs_register_uint_preference(ieee802154_module, "802154_ethertype", "802.15.4 Ethertype (in hex)", @@ -1826,11 +1826,11 @@ void proto_reg_handoff_ieee802154(void) prefs_initialized = TRUE; } else { - dissector_delete("ethertype", old_ieee802154_ethertype, ieee802154_handle); + dissector_delete("ethertype", old_ieee802154_ethertype, ieee802154_handle); } old_ieee802154_ethertype = ieee802154_ethertype; - + /* Register dissector handles. */ dissector_add("ethertype", ieee802154_ethertype, ieee802154_handle); |