Convert proto_tree_add_time_format to either proto_tree_add_time or proto_tree_add_time_format_value.

Only proto_tree_add_time_format calls remaining are in packet-ncp2222.inc, which may just need some additional filters.

svn path=/trunk/; revision=52269

8 files changed, 23 insertions, 34 deletions

diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index 41a9f76197..4d20640a7b 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -5481,9 +5481,9 @@ dissect_dcerpc_dg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
         server_boot.nsecs = 0;
 
         if (hdr.server_boot == 0)
-            proto_tree_add_time_format(dcerpc_tree, hf_dcerpc_dg_server_boot,
+            proto_tree_add_time_format_value(dcerpc_tree, hf_dcerpc_dg_server_boot,
                                        tvb, offset, 4, &server_boot,
-                                       "Server boot time: Unknown (0)");
+                                       "Unknown (0)");
         else
             proto_tree_add_time(dcerpc_tree, hf_dcerpc_dg_server_boot,
                                 tvb, offset, 4, &server_boot);
diff --git a/epan/dissectors/packet-dvb-eit.c b/epan/dissectors/packet-dvb-eit.c
index 9fce2d2874..d9c507441a 100644
--- a/epan/dissectors/packet-dvb-eit.c
+++ b/epan/dissectors/packet-dvb-eit.c
@@ -165,9 +165,8 @@ dissect_dvb_eit(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
             if (packet_mpeg_sect_mjd_to_utc_time(tvb, offset, &start_time) < 0) {
                 proto_tree_add_text(tree, tvb, offset, 5, "Unparseable time");
             } else {
-                proto_tree_add_time_format(dvb_eit_event_tree, hf_dvb_eit_start_time, tvb, offset,
-                    5, &start_time,
-                    "Start Time: %s UTC", abs_time_to_str(&start_time, ABSOLUTE_TIME_UTC, FALSE));
+                proto_tree_add_time(dvb_eit_event_tree, hf_dvb_eit_start_time, tvb, offset,
+                    5, &start_time);
             }
         } else {
             proto_tree_add_text(tree, tvb, offset, 5, "Start Time: Undefined (0xFFFFFFFFFF)");
diff --git a/epan/dissectors/packet-dvb-tdt.c b/epan/dissectors/packet-dvb-tdt.c
index 41caa84172..62e52cd2bc 100644
--- a/epan/dissectors/packet-dvb-tdt.c
+++ b/epan/dissectors/packet-dvb-tdt.c
@@ -61,8 +61,7 @@ dissect_dvb_tdt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     if (packet_mpeg_sect_mjd_to_utc_time(tvb, offset, &utc_time) < 0) {
         proto_tree_add_text(dvb_tdt_tree, tvb, offset, 5, "Unparseable time");
     } else {
-        proto_tree_add_time_format(dvb_tdt_tree, hf_dvb_tdt_utc_time, tvb, offset, 5, &utc_time,
-            "UTC Time : %s UTC", abs_time_to_str(&utc_time, ABSOLUTE_TIME_UTC, FALSE));
+        proto_tree_add_time(dvb_tdt_tree, hf_dvb_tdt_utc_time, tvb, offset, 5, &utc_time);
     }
     offset += 5;
 
diff --git a/epan/dissectors/packet-dvb-tot.c b/epan/dissectors/packet-dvb-tot.c
index 968b5e1ea0..fe0f1e43e1 100644
--- a/epan/dissectors/packet-dvb-tot.c
+++ b/epan/dissectors/packet-dvb-tot.c
@@ -69,8 +69,7 @@ dissect_dvb_tot(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     if (packet_mpeg_sect_mjd_to_utc_time(tvb, offset, &utc_time) < 0) {
         proto_tree_add_text(dvb_tot_tree, tvb, offset, 5, "UTC Time : Unparseable time");
     } else {
-        proto_tree_add_time_format(dvb_tot_tree, hf_dvb_tot_utc_time, tvb, offset, 5, &utc_time,
-            "UTC Time : %s UTC", abs_time_to_str(&utc_time, ABSOLUTE_TIME_UTC, FALSE));
+        proto_tree_add_time(dvb_tot_tree, hf_dvb_tot_utc_time, tvb, offset, 5, &utc_time);
     }
 
     offset += 5;
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c
index 2c65a3626a..1f064ea3a7 100644
--- a/epan/dissectors/packet-dvbci.c
+++ b/epan/dissectors/packet-dvbci.c
@@ -2757,9 +2757,8 @@ dissect_dvbci_payload_dt(guint32 tag, gint len_field,
     if (tag==T_DATE_TIME_ENQ) {
         nstime_set_zero(&resp_intv);
         resp_intv.secs = tvb_get_guint8(tvb, offset);
-        pi = proto_tree_add_time_format(tree, hf_dvbci_resp_intv,
-                tvb, offset, 1, &resp_intv, "Response interval is %s",
-                rel_time_to_str(&resp_intv));
+        pi = proto_tree_add_time(tree, hf_dvbci_resp_intv,
+                tvb, offset, 1, &resp_intv);
         if (resp_intv.secs==0) {
             col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "individual query");
             if (pi)
@@ -2784,9 +2783,8 @@ dissect_dvbci_payload_dt(guint32 tag, gint len_field,
                 "Invalid UTC time field, 2 bytes MJD, 3 bytes BCD time hhmmss");
             return;
         }
-        proto_tree_add_time_format(tree, hf_dvbci_utc_time,
-                tvb, offset, time_field_len, &utc_time,
-                "%s UTC", abs_time_to_str(&utc_time, ABSOLUTE_TIME_UTC, FALSE));
+        proto_tree_add_time(tree, hf_dvbci_utc_time,
+                tvb, offset, time_field_len, &utc_time);
         col_append_sep_fstr(pinfo->cinfo, COL_INFO, ": ", "%s UTC",
                 abs_time_to_str(&utc_time, ABSOLUTE_TIME_UTC, FALSE));
         offset += time_field_len;
@@ -3245,10 +3243,8 @@ dissect_dvbci_payload_cc(guint32 tag, gint len_field _U_,
                 }
                 else {
                     /* abs_time_to_str() never returns NULL */
-                    proto_tree_add_time_format(tree, hf_dvbci_pin_chg_time,
-                            tvb, offset, UTC_TIME_LEN, &utc_time,
-                            "PIN change time %s UTC",
-                            abs_time_to_str(&utc_time, ABSOLUTE_TIME_UTC, FALSE));
+                    proto_tree_add_time(tree, hf_dvbci_pin_chg_time,
+                            tvb, offset, UTC_TIME_LEN, &utc_time);
                 }
             }
             offset += UTC_TIME_LEN;
@@ -3276,10 +3272,8 @@ dissect_dvbci_payload_cc(guint32 tag, gint len_field _U_,
                 break;
             }
             else {
-                proto_tree_add_time_format(tree, hf_dvbci_pin_evt_time,
-                        tvb, offset, UTC_TIME_LEN, &utc_time,
-                        "PIN event time %s UTC",
-                        abs_time_to_str(&utc_time, ABSOLUTE_TIME_UTC, FALSE));
+                proto_tree_add_time(tree, hf_dvbci_pin_evt_time,
+                        tvb, offset, UTC_TIME_LEN, &utc_time);
             }
             offset += UTC_TIME_LEN;
             evt_cent = tvb_get_guint8(tvb, offset);
diff --git a/epan/dissectors/packet-mpeg-descriptor.c b/epan/dissectors/packet-mpeg-descriptor.c
index 69ef802604..cb035e2e9d 100644
--- a/epan/dissectors/packet-mpeg-descriptor.c
+++ b/epan/dissectors/packet-mpeg-descriptor.c
@@ -1696,9 +1696,7 @@ proto_mpeg_descriptor_dissect_local_time_offset(tvbuff_t *tvb, guint offset, gui
         if (packet_mpeg_sect_mjd_to_utc_time(tvb, offset, &time_of_change) < 0) {
             proto_tree_add_text(tree, tvb, offset, 5, "Time of Change : Unparseable time");
         } else {
-            proto_tree_add_time_format(tree, hf_mpeg_descr_local_time_offset_time_of_change, tvb, offset, 5,
-            &time_of_change, "Time of Change : %s UTC",
-            abs_time_to_str(&time_of_change, ABSOLUTE_TIME_UTC, FALSE));
+            proto_tree_add_time(tree, hf_mpeg_descr_local_time_offset_time_of_change, tvb, offset, 5, &time_of_change);
         }
         offset += 5;
 
diff --git a/epan/dissectors/packet-ncp2222.inc b/epan/dissectors/packet-ncp2222.inc
index 7e93cd7bdd..3f8630268f 100644
--- a/epan/dissectors/packet-ncp2222.inc
+++ b/epan/dissectors/packet-ncp2222.inc
@@ -4559,8 +4559,7 @@ process_entry_info(proto_tree *it_tree, tvbuff_t *tvb, nds_val *values)
     if (iter_flags & DSI_PURGE_TIME) { /* Purge Time */
         ns.secs = tvb_get_letohl(tvb, ioffset);   /* Seconds */
         ns.nsecs = 0;
-        proto_tree_add_time_format(it_tree, hf_nds_purge, tvb, ioffset,
-                4, &ns, "Purge Time: %s", abs_time_secs_to_str(ns.secs, ABSOLUTE_TIME_LOCAL, TRUE));
+        proto_tree_add_time(it_tree, hf_nds_purge, tvb, ioffset, 4, &ns);
         ioffset = ioffset + 4;
     }
     if (iter_flags & DSI_DEREFERENCED_BASE_CLASS) { /* Dereference Base Class */
@@ -5377,8 +5376,7 @@ process_multivalues(proto_tree *ncp_tree, tvbuff_t *tvb, packet_info *pinfo, nds
                     case 0x00000010:                /*p3values.bit5 = "Purge Time"*/
                         ns.secs = tvb_get_letohl(tvb, ioffset);   /* Seconds */
                         ns.nsecs = 0;
-                        proto_tree_add_time_format(ntree, hf_nds_purge, tvb, ioffset,
-                                                   4, &ns, "Purge Time: %s", abs_time_secs_to_str(ns.secs, ABSOLUTE_TIME_LOCAL, TRUE));
+                        proto_tree_add_time(ntree, hf_nds_purge, tvb, ioffset, 4, &ns);
                         ioffset = ioffset + 4;
                         break;
                     case 0x00000020:                /*p3values.bit6 = "Local Partition ID"*/
diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c
index f829be2f5f..2dedc45559 100644
--- a/epan/dissectors/packet-pktc.c
+++ b/epan/dissectors/packet-pktc.c
@@ -511,10 +511,12 @@ dissect_pktc_mtafqdn_krbsafeuserdata(packet_info *pinfo, tvbuff_t *tvb, proto_tr
        /* manufacturer cert revocation time */
        bignum = tvb_get_ntohl(tvb, offset);
        ts.secs = bignum;
-       proto_tree_add_time_format(tree, hf_pktc_mtafqdn_manu_cert_revoked, tvb, offset, 4,
-                                  &ts, "%s: %s",
-                                  proto_registrar_get_name(hf_pktc_mtafqdn_manu_cert_revoked),
-                                  (bignum==0) ? "not revoked" : abs_time_secs_to_str(bignum, ABSOLUTE_TIME_LOCAL, TRUE));
+       if (bignum==0) {
+           proto_tree_add_time_format_value(tree, hf_pktc_mtafqdn_manu_cert_revoked, tvb, offset, 4,
+                                  &ts, "not revoked");
+       } else {
+           proto_tree_add_time(tree, hf_pktc_mtafqdn_manu_cert_revoked, tvb, offset, 4, &ts);
+       }
        break;
 
     case PKTC_MTAFQDN_REP: