aboutsummaryrefslogtreecommitdiff
path: root/tools/perf
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2013-01-24 16:10:42 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2013-01-24 16:40:53 -0300
commit5a3d04d6dc9050b4b4562f5c66aea23f0aa1c003 (patch)
treed52d3d5fcd15f5afbf2781589b34b2874da9f50c /tools/perf
parent1de7b7e89d16e3daf32fb3b6f214d038ab2ed879 (diff)
downloadvexpress-lsk-5a3d04d6dc9050b4b4562f5c66aea23f0aa1c003.tar.gz
perf tools: Allow passing NULL to intlist__find
So that we can work with optional parameters that may not set up an intlist. Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Namhyung Kim <namhyung@gmail.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/n/tip-e9tmvgdzehqrza11zs0nbg7g@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/util/intlist.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/perf/util/intlist.c b/tools/perf/util/intlist.c
index 9d0740024ba..cbf0c32ce40 100644
--- a/tools/perf/util/intlist.c
+++ b/tools/perf/util/intlist.c
@@ -59,9 +59,14 @@ void intlist__remove(struct intlist *ilist, struct int_node *node)
struct int_node *intlist__find(struct intlist *ilist, int i)
{
- struct int_node *node = NULL;
- struct rb_node *rb_node = rblist__find(&ilist->rblist, (void *)((long)i));
+ struct int_node *node;
+ struct rb_node *rb_node;
+
+ if (ilist == NULL)
+ return NULL;
+ node = NULL;
+ rb_node = rblist__find(&ilist->rblist, (void *)((long)i));
if (rb_node)
node = container_of(rb_node, struct int_node, rb_node);