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-wsp.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-wsp.c')
| -rw-r--r-- | epan/dissectors/packet-wsp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index 18cb45a38d..ad8492bcba 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -1809,7 +1809,7 @@ add_headers (proto_tree *tree, tvbuff_t *tvb, int hf, packet_info *pinfo) tvb, hdr_start, hdr_len + val_len, "Requesting Time Of Day"); } else { - val_str = abs_time_secs_to_ep_str(val, ABSOLUTE_TIME_LOCAL, TRUE); + val_str = abs_time_secs_to_str(wmem_packet_scope(), val, ABSOLUTE_TIME_LOCAL, TRUE); ti = proto_tree_add_string (wsp_headers, hf_hdr_x_wap_tod, tvb, hdr_start, hdr_len + val_len, val_str); @@ -2854,12 +2854,12 @@ wkh_ ## underscored(proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, packet_i if (val_id <= 4) { /* Length field already parsed by macro! */ \ get_date_value(val, tvb, off, len, ok); \ if (ok) { \ - str = abs_time_secs_to_ep_str(val, ABSOLUTE_TIME_LOCAL, TRUE); \ + str = abs_time_secs_to_str(wmem_packet_scope(), val, ABSOLUTE_TIME_LOCAL, TRUE); \ tvb_ensure_bytes_exist(tvb, hdr_start, offset - hdr_start); \ ti = proto_tree_add_string(tree, hf_hdr_ ## underscored, \ tvb, hdr_start, offset - hdr_start, str); \ /* BEHOLD: do NOT try to free str, as \ - * abs_time_secs_to_ep_str() returns wmem_allocated data */ \ + * abs_time_secs_to_str(wmem_packet_scope(), ) returns wmem_allocated data */ \ } \ } \ wkh_4_End(hf_hdr_ ## underscored); \ @@ -2889,12 +2889,12 @@ wkh_ ## underscored(proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, packet_i if (val_id <= 4) { /* Length field already parsed by macro! */ \ get_date_value(val, tvb, off, len, ok); \ if (ok) { \ - str = abs_time_secs_to_ep_str(val, ABSOLUTE_TIME_LOCAL, TRUE); \ + str = abs_time_secs_to_str(wmem_packet_scope(), val, ABSOLUTE_TIME_LOCAL, TRUE); \ tvb_ensure_bytes_exist(tvb, hdr_start, offset - hdr_start); \ ti = proto_tree_add_string(tree, hf_hdr_ ## underscored, \ tvb, hdr_start, offset - hdr_start, str); \ /* BEHOLD: do NOT try to free str, as \ - * abs_time_secs_to_ep_str() returns wmem_allocated data */ \ + * abs_time_secs_to_str(wmem_packet_scope(), ) returns wmem_allocated data */ \ } \ } \ wkh_4_End(hf_hdr_ ## underscored); \ @@ -2942,7 +2942,7 @@ wkh_ ## underscored(proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, packet_i tvb, hdr_start, offset - hdr_start, \ "Requesting Time Of Day"); \ } else { \ - str = abs_time_secs_to_ep_str(val, ABSOLUTE_TIME_LOCAL, TRUE); \ + str = abs_time_secs_to_str(wmem_packet_scope(), val, ABSOLUTE_TIME_LOCAL, TRUE); \ tvb_ensure_bytes_exist(tvb, hdr_start, offset - hdr_start); \ ti = proto_tree_add_string(tree, hf_hdr_ ## underscored, \ tvb, hdr_start, offset - hdr_start, str); \ @@ -3590,11 +3590,11 @@ wkh_profile_warning(proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, packet_i get_date_value(val, tvb, off, len, ok); if (ok) { /* Valid warn-text string */ off += len; - val_str = abs_time_secs_to_ep_str(val, ABSOLUTE_TIME_LOCAL, TRUE); + val_str = abs_time_secs_to_str(wmem_packet_scope(), val, ABSOLUTE_TIME_LOCAL, TRUE); str = wmem_strdup_printf(wmem_packet_scope(), "; date=%s", val_str); proto_item_append_string(ti, str); /* BEHOLD: do NOT try to free str, as \ - * abs_time_secs_to_ep_str() returns wmem_allocated data */ \ + * abs_time_secs_to_str(wmem_packet_scope(), ) returns wmem_allocated data */ \ } } } |