diff options
author | Michael Mann <mmann78@netscape.net> | 2013-09-30 15:42:18 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2013-09-30 15:42:18 +0000 |
commit | 47bca84efb52f3998f47bac03e09f34a6cd2b03a (patch) | |
tree | b48d150ef0c9fdd0abc9866b3d41fabfa7b631df | |
parent | 097feb5a6446635875816a57189a68c017ad82cd (diff) |
Convert proto_tree_add_double_format calls to proto_tree_add_double_format_value where appropriate.
svn path=/trunk/; revision=52298
-rw-r--r-- | epan/dissectors/packet-ldp.c | 20 | ||||
-rw-r--r-- | epan/dissectors/packet-ntp.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-olsr.c | 10 | ||||
-rw-r--r-- | epan/dissectors/packet-ptp.c | 4 |
4 files changed, 21 insertions, 21 deletions
diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index 7b5a013ea2..1b2766aa41 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -2042,31 +2042,31 @@ dissect_tlv_traffic(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) /* PDR */ val_f = tvb_get_ntohieee_float (tvb, offset); - proto_tree_add_double_format(val_tree, hf_ldp_tlv_pdr, tvb, offset, - 4, val_f, "PDR: %.10g Bps", val_f); + proto_tree_add_double_format_value(val_tree, hf_ldp_tlv_pdr, tvb, offset, + 4, val_f, "%.10g Bps", val_f); offset += 4; /* PBS */ val_f = tvb_get_ntohieee_float (tvb, offset); - proto_tree_add_double_format(val_tree, hf_ldp_tlv_pbs, tvb, offset, - 4, val_f, "PBS: %.10g Bytes", val_f); + proto_tree_add_double_format_value(val_tree, hf_ldp_tlv_pbs, tvb, offset, + 4, val_f, "%.10g Bytes", val_f); offset += 4; /* CDR */ val_f = tvb_get_ntohieee_float (tvb, offset); - proto_tree_add_double_format(val_tree, hf_ldp_tlv_cdr, tvb, offset, - 4, val_f, "CDR: %.10g Bps", val_f); + proto_tree_add_double_format_value(val_tree, hf_ldp_tlv_cdr, tvb, offset, + 4, val_f, "%.10g Bps", val_f); offset += 4; /* CBS */ val_f = tvb_get_ntohieee_float (tvb, offset); - proto_tree_add_double_format(val_tree, hf_ldp_tlv_cbs, tvb, offset, - 4, val_f, "CBS: %.10g Bytes", val_f); + proto_tree_add_double_format_value(val_tree, hf_ldp_tlv_cbs, tvb, offset, + 4, val_f, "%.10g Bytes", val_f); offset += 4; /* EBS */ val_f = tvb_get_ntohieee_float (tvb, offset); - proto_tree_add_double_format(val_tree, hf_ldp_tlv_ebs, tvb, offset, - 4, val_f, "EBS: %.10g Bytes", val_f); + proto_tree_add_double_format_value(val_tree, hf_ldp_tlv_ebs, tvb, offset, + 4, val_f, "%.10g Bytes", val_f); } } diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c index abc76bfac0..ec078c599e 100644 --- a/epan/dissectors/packet-ntp.c +++ b/epan/dissectors/packet-ntp.c @@ -808,9 +808,9 @@ dissect_ntp_std(tvbuff_t *tvb, proto_tree *ntp_tree, guint8 flags) */ rootdelay = ((gint16)tvb_get_ntohs(tvb, 4)) + (tvb_get_ntohs(tvb, 6) / 65536.0); - proto_tree_add_double_format(ntp_tree, hf_ntp_rootdelay, tvb, 4, 4, + proto_tree_add_double_format_value(ntp_tree, hf_ntp_rootdelay, tvb, 4, 4, rootdelay, - "Root Delay: %9.4f sec", + "%9.4f sec", rootdelay); /* Root Dispersion, 32-bit unsigned fixed-point number indicating @@ -819,9 +819,9 @@ dissect_ntp_std(tvbuff_t *tvb, proto_tree *ntp_tree, guint8 flags) */ rootdispersion = ((gint16)tvb_get_ntohs(tvb, 8)) + (tvb_get_ntohs(tvb, 10) / 65536.0); - proto_tree_add_double_format(ntp_tree, hf_ntp_rootdispersion, tvb, 8, 4, + proto_tree_add_double_format_value(ntp_tree, hf_ntp_rootdispersion, tvb, 8, 4, rootdispersion, - "Root Dispersion: %9.4f sec", + "%9.4f sec", rootdispersion); /* Now, there is a problem with secondary servers. Standards diff --git a/epan/dissectors/packet-olsr.c b/epan/dissectors/packet-olsr.c index efc6f0e65d..2b2dd80046 100644 --- a/epan/dissectors/packet-olsr.c +++ b/epan/dissectors/packet-olsr.c @@ -296,8 +296,8 @@ static int dissect_olsr_hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ols /*---------------------Dissect Hello Emission Invertal-------------------*/ hTime = getOlsrTime(tvb_get_guint8(tvb, offset)); - proto_tree_add_double_format(olsr_tree, hf_olsr_htime, tvb, offset, 1, hTime, - "Hello Emission Interval: %.3f (in seconds)", hTime); + proto_tree_add_double_format_value(olsr_tree, hf_olsr_htime, tvb, offset, 1, hTime, + "%.3f (in seconds)", hTime); offset++; /*-------------------------Dissect Willingness---------------------------*/ @@ -587,8 +587,8 @@ static int dissect_olsr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi offset++; /*-------------Dissect Validity Time-------------------------*/ - proto_tree_add_double_format(message_tree, hf_olsr_vtime, tvb, offset, 1, vTime, - "Validity Time: %.3f (in seconds)", vTime); + proto_tree_add_double_format_value(message_tree, hf_olsr_vtime, tvb, offset, 1, vTime, + "%.3f (in seconds)", vTime); offset++; /*-------------Dissect Message Size---------------------------*/ @@ -736,7 +736,7 @@ void proto_register_olsr(void) { }, { &hf_olsr_htime, - { "Hello emission interval", "olsr.htime", + { "Hello Emission Interval", "olsr.htime", FT_DOUBLE, BASE_NONE, NULL, 0, "Hello emission interval in seconds", HFILL } diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c index 2b3a978ed0..6813f89185 100644 --- a/epan/dissectors/packet-ptp.c +++ b/epan/dissectors/packet-ptp.c @@ -2316,9 +2316,9 @@ dissect_ptp_v2_timeInterval(tvbuff_t *tvb, guint16 *cur_offset, proto_tree *tree proto_tree_add_uint64_format_value(ptptimeInterval_subtree, hf_ptp_v2_timeInterval_ns, tvb, *cur_offset, 6, time_ns, "Ns: %" G_GINT64_MODIFIER "d nanoseconds", time_ns); - proto_tree_add_double_format(ptptimeInterval_subtree, + proto_tree_add_double_format_value(ptptimeInterval_subtree, hf_ptp_v2_timeInterval_subns, tvb, *cur_offset+6, 2, (time_subns/65536.0), - "SubNs: %f nanoseconds", (time_subns/65536.0)); + "%f nanoseconds", (time_subns/65536.0)); *cur_offset = *cur_offset + 8; } |