Skip to content

Commit

Permalink
perf_counter tools: Fix error condition in parse_aliases()
Browse files Browse the repository at this point in the history
gcc warned about this bug:

util/parse-events.c: In function ‘parse_generic_hw_symbols’:
util/parse-events.c:175: warning: comparison is always false due to limited range of data type
util/parse-events.c:182: warning: comparison is always false due to limited range of data type
util/parse-events.c:190: warning: comparison is always false due to limited range of data type

Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Ingo Molnar committed Jun 6, 2009
1 parent 7d37a0c commit 8953645
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions tools/perf/util/parse-events.c
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,12 @@ static int parse_aliases(const char *str, char *names[][MAX_ALIASES], int size)
}
}

return 0;
return -1;
}

static int parse_generic_hw_symbols(const char *str, struct perf_counter_attr *attr)
{
__u8 cache_type = -1, cache_op = 0, cache_result = 0;
int cache_type = -1, cache_op = 0, cache_result = 0;

cache_type = parse_aliases(str, hw_cache, PERF_COUNT_HW_CACHE_MAX);
/*
Expand All @@ -179,8 +179,8 @@ static int parse_generic_hw_symbols(const char *str, struct perf_counter_attr *a
/*
* Fall back to reads:
*/
if (cache_type == -1)
cache_type = PERF_COUNT_HW_CACHE_OP_READ;
if (cache_op == -1)
cache_op = PERF_COUNT_HW_CACHE_OP_READ;

cache_result = parse_aliases(str, hw_cache_result,
PERF_COUNT_HW_CACHE_RESULT_MAX);
Expand Down

0 comments on commit 8953645

Please sign in to comment.