diff options
| author | Evan Huus <eapache@gmail.com> | 2014-06-15 23:42:14 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-16 17:26:25 +0000 |
| commit | de00c49bd84c853c9260f70cc5857c5a5ab6d3be (patch) | |
| tree | d20495295746d9c1b0623b631931f538ee6d3581 /epan/dissectors/packet-icmp.c | |
| parent | b71b68cd637de5501de9d5684c79b6c8b5b2dfd3 (diff) | |
Convert a bunch of time_to_str functions to wmem
Change-Id: I24fe3cc4a3589dadc4528a77fe7ff13d06b1a983
Reviewed-on: https://code.wireshark.org/review/2245
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-icmp.c')
| -rw-r--r-- | epan/dissectors/packet-icmp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index 2cef13f582..1f7b8bbc62 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -1465,7 +1465,7 @@ dissect_icmp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data) "Address entry size: %u", addr_entry_size); proto_tree_add_text(icmp_tree, tvb, 6, 2, "Lifetime: %s", - time_secs_to_ep_str(tvb_get_ntohs + time_secs_to_str(wmem_packet_scope(), tvb_get_ntohs (tvb, 6))); break; @@ -1692,17 +1692,17 @@ dissect_icmp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data) get_best_guess_mstimeofday(tvb, 8, frame_ts); proto_tree_add_text(icmp_tree, tvb, 8, 4, "Originate timestamp: %s after midnight UTC", - time_msecs_to_ep_str(orig_ts)); + time_msecs_to_str(wmem_packet_scope(), orig_ts)); proto_tree_add_text(icmp_tree, tvb, 12, 4, "Receive timestamp: %s after midnight UTC", - time_msecs_to_ep_str - (get_best_guess_mstimeofday + time_msecs_to_str + (wmem_packet_scope(), get_best_guess_mstimeofday (tvb, 12, orig_ts))); proto_tree_add_text(icmp_tree, tvb, 16, 4, "Transmit timestamp: %s after midnight UTC", - time_msecs_to_ep_str - (get_best_guess_mstimeofday + time_msecs_to_str + (wmem_packet_scope(), get_best_guess_mstimeofday (tvb, 16, orig_ts))); } break; |