diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-19 14:10:00 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-19 18:26:57 +0000 |
| commit | b0bc4d5535b4112cdc71eb87e351bc87aba0c7c5 (patch) | |
| tree | 7b2d0f02eed4233b19019b717457c5ecfa01ab6d /epan/dissectors/packet-iax2.c | |
| parent | 14824e6adf07a1c3cfb6537ce8723d873ecd0d0f (diff) | |
| download | wireshark-b0bc4d5535b4112cdc71eb87e351bc87aba0c7c5.tar.gz wireshark-b0bc4d5535b4112cdc71eb87e351bc87aba0c7c5.tar.bz2 wireshark-b0bc4d5535b4112cdc71eb87e351bc87aba0c7c5.zip | |
Revert "Fixup: ep_address_to_str -> address_to_str"
Most (all?) of these functions are being called within GUI, so they can't have packet_scope, which is why they weren't already converted (I made this mistake once already)
This reverts commit 7fea55a0541bcc5059f767970b6f6291f81d7b9c.
Change-Id: I4bf29b206e5e1f5daefcec131309a8f6e78e1eb1
Reviewed-on: https://code.wireshark.org/review/2428
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-iax2.c')
| -rw-r--r-- | epan/dissectors/packet-iax2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index 75d100b2b9..dd60ab58b3 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -605,12 +605,12 @@ static gchar *key_to_str( const iax_circuit_key *key ) } strp = str[i]; - /* why doesn't address_to_str take a const pointer? + /* why doesn't ep_address_to_str take a const pointer? cast the warnings into oblivion. */ /* XXX - is this a case for wmem_packet_scope()? */ g_snprintf(strp, 80, "{%s:%i,%i}", - address_to_str(wmem_packet_scope(), (address *)&key->addr), + ep_address_to_str((address *)&key->addr), key->port, key->callno); return strp; @@ -932,8 +932,8 @@ static iax_call_data *iax_lookup_call( packet_info *pinfo, #ifdef DEBUG_HASHING g_debug("++ iax_lookup_circuit_details: Looking up circuit for frame %u, " "from {%s:%u:%u} to {%s:%u:%u}", pinfo->fd->num, - address_to_str(wmem_packet_scope(), &pinfo->src), pinfo->srcport, scallno, - address_to_str(wmem_packet_scope(), &pinfo->dst), pinfo->destport, dcallno); + ep_address_to_str(&pinfo->src), pinfo->srcport, scallno, + ep_address_to_str(&pinfo->dst), pinfo->destport, dcallno); #endif |