aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-rsvp.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2010-03-07 21:09:14 +0000
committerGuy Harris <guy@alum.mit.edu>2010-03-07 21:09:14 +0000
commit7e7ced5c305ac666aeaf0e13cd6608aa5a64f6e5 (patch)
tree5e109bfd8c2290cdbc0674ca5b9382f95199deaa /epan/dissectors/packet-rsvp.c
parent6de362457d74eacc259088f3472511fbbef150fa (diff)
Make some constants float, as they're used to compute a value assigned
to a float, rather than a double, variable. svn path=/trunk/; revision=32140
Diffstat (limited to 'epan/dissectors/packet-rsvp.c')
-rw-r--r--epan/dissectors/packet-rsvp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c
index 3e5a7a97f6..08004f546b 100644
--- a/epan/dissectors/packet-rsvp.c
+++ b/epan/dissectors/packet-rsvp.c
@@ -3380,12 +3380,12 @@ dissect_glabel_lambda(proto_tree *ti _U_, proto_tree *rsvp_object_tree,
if (grid == 1) {
/* DWDM grid: Frequency (THz) = 193.1 THz + n * channel spacing (THz) */
cs_thz =
- cs == 1 ? 0.1 :
- cs == 2 ? 0.05 :
- cs == 3 ? 0.025 :
- cs == 4 ? 0.0125 :
- 0.0;
- freq = 193.1 + (n * cs_thz);
+ cs == 1 ? 0.1f :
+ cs == 2 ? 0.05f :
+ cs == 3 ? 0.025f :
+ cs == 4 ? 0.0125f :
+ 0.0f;
+ freq = 193.1f + (n * cs_thz);
proto_tree_add_text(rsvp_object_tree, tvb, offset, 4,
"Wavelength Label: "
"grid=%s, "