summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-c15ch.c
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2015-04-23 14:35:40 +0200
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2015-04-23 14:39:11 +0000
commitcc6c6db5e47a66e22940bb790d38f82d0b40b5f7 (patch)
treedd50329197d89c7115c82a7ddedc0b99777b87fc /epan/dissectors/packet-c15ch.c
parent62908879ab1964e52b21395fcfe2348ed605d8e0 (diff)
downloadwireshark-cc6c6db5e47a66e22940bb790d38f82d0b40b5f7.tar.gz
C15ch: try to make buildbot Happy
packet-c15ch.c:5798: warning: comparison of unsigned expression >= 0 is always true packet-c15ch.c:5809: warning: comparison of unsigned expression < 0 is always false packet-c15ch.c:5841: warning: comparison of unsigned expression < 0 is always false packet-c15ch.c:5859: warning: comparison of unsigned expression < 0 is always false packet-c15ch.c:5917: warning: comparison is always false due to limited range of data type Change-Id: Ia12f83c070bc1b794581cd37e330c38b0bad0516 Reviewed-on: https://code.wireshark.org/review/8174 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-c15ch.c')
-rw-r--r--epan/dissectors/packet-c15ch.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-c15ch.c b/epan/dissectors/packet-c15ch.c
index c852a08b0e..9d35b9397c 100644
--- a/epan/dissectors/packet-c15ch.c
+++ b/epan/dissectors/packet-c15ch.c
@@ -5795,7 +5795,7 @@ static int dissect_c15ch_cp_event(tvbuff_t *tvb, packet_info *pinfo, proto_tree
col_add_fstr(pinfo->cinfo, COL_INFO, "Type: CP_EVENT, PM Type: %s",
val_to_str_ext(pm_value, &c15_pm_types_ext, "Unknown %d") );
- if ( ( pm_value >= MIN_PM_VAL ) && ( pm_value <= MAX_PM_VAL ) && ( pm_value != DIG_CKT_TEST_PM_VALUE ) )
+ if ( ( pm_value <= MAX_PM_VAL ) && ( pm_value != DIG_CKT_TEST_PM_VALUE ) )
{
col_append_fstr(pinfo->cinfo, COL_INFO, ", Sub PM: %s",
val_to_str(subpm_value, subpm_name_tables[ pm_value ], "%d") );
@@ -5806,7 +5806,7 @@ static int dissect_c15ch_cp_event(tvbuff_t *tvb, packet_info *pinfo, proto_tree
{
col_append_fstr(pinfo->cinfo, COL_INFO, ", Trk PM: %s",
val_to_str(trkpm_value, trkpm_dig_ckt_test_types, "%d") );
- if ( ( trkpm_value < MIN_DIG_CKT_TEST_TRKPM_VAL ) || ( trkpm_value > MAX_DIG_CKT_TEST_TRKPM_VAL ) )
+ if ( trkpm_value > MAX_DIG_CKT_TEST_TRKPM_VAL )
{
col_append_fstr(pinfo->cinfo, COL_INFO, ", Sub PM: %d", subpm_value);
}
@@ -5838,7 +5838,7 @@ static int dissect_c15ch_cp_event(tvbuff_t *tvb, packet_info *pinfo, proto_tree
proto_tree_add_item(c15ch_cp_event_tree, hf_c15ch_cp_event_pm,
tvb, 0, 4, ENC_BIG_ENDIAN);
- if ( (pm_value < MIN_PM_VAL) || (pm_value > MAX_PM_VAL) )
+ if ( pm_value > MAX_PM_VAL )
{
/* Unknown Type */
proto_tree_add_item(c15ch_cp_event_tree, hf_c15ch_cp_event_subpm,
@@ -5856,7 +5856,7 @@ static int dissect_c15ch_cp_event(tvbuff_t *tvb, packet_info *pinfo, proto_tree
else
{
/* special case for labeling subpm values of dig_ckt pm type */
- if ( ( trkpm_value < MIN_DIG_CKT_TEST_TRKPM_VAL ) || ( trkpm_value > MAX_DIG_CKT_TEST_TRKPM_VAL ))
+ if ( trkpm_value > MAX_DIG_CKT_TEST_TRKPM_VAL )
{
/* this is a dig_ckt pm type, but the trkpm value is out of range */
/* use the default dig_ckt subpm field from the subpm_table */
@@ -5914,7 +5914,7 @@ static int dissect_c15ch_inc_gwe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
fiat_num = tvb_get_guint8(tvb, 9);
type_num = tvb_get_guint8(tvb, 10);
- if ( (task_num < FIRST_TASK_TYPE_INDEX) || (task_num > LAST_TASK_TYPE_INDEX) )
+ if ( task_num > LAST_TASK_TYPE_INDEX )
{ /* this happens for unknown task types */
task_in_range = FALSE;
fiat_index_in_range = FALSE; /* don't guess what the correct fiat table should be for unknown task */