diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-03-01 07:02:08 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-03-01 07:02:08 +0000 |
| commit | 3478c66464da6a4f6360c5f6fd13cc82edd4b1f4 (patch) | |
| tree | 04a16ef47b9db16e1c72b28f491882d5a2429d73 /epan/dissectors/packet-rsvp.c | |
| parent | 181751aa74f141c63e0491dd2c3d7d7efac81a6e (diff) | |
Fix Coverity CID 280396: Logically dead code.
svn path=/trunk/; revision=47973
Diffstat (limited to 'epan/dissectors/packet-rsvp.c')
| -rw-r--r-- | epan/dissectors/packet-rsvp.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index 0c27c1c638..6d92803588 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -3852,9 +3852,7 @@ dissect_glabel_lambda(proto_tree *ti _U_, proto_tree *rsvp_object_tree, "n=%d, " "freq=%.2fTHz", /* grid */ - grid == 1 ? "DWDM" : - grid == 2 ? "CWDM" : - "unknown", + "DWDM", /* channel spacing */ cs == 1 ? "100GHz" : cs == 2 ? "50GHz" : @@ -3870,9 +3868,7 @@ dissect_glabel_lambda(proto_tree *ti _U_, proto_tree *rsvp_object_tree, "channel spacing=%s, " "n=%d, " "freq=%.2fTHz", - grid == 1 ? "DWDM" : - grid == 2 ? "CWDM" : - "unknown", + "DWDM", cs == 1 ? "100GHz" : cs == 2 ? "50GHz" : cs == 3 ? "25GHz" : @@ -3890,9 +3886,7 @@ dissect_glabel_lambda(proto_tree *ti _U_, proto_tree *rsvp_object_tree, "n=%d, " "wavelength=%unm", /* grid */ - grid == 1 ? "DWDM" : - grid == 2 ? "CWDM" : - "unknown", + "CWDM", /* channel spacing */ cs == 1 ? "20nm" : "unknown", @@ -3905,9 +3899,7 @@ dissect_glabel_lambda(proto_tree *ti _U_, proto_tree *rsvp_object_tree, "channel spacing=%s, " "n=%d, " "wavelength=%unm", - grid == 1 ? "DWDM" : - grid == 2 ? "CWDM" : - "unknown", + "CWDM", cs == 1 ? "20nm" : "unknown", n, |