From: Arnaldo Carvalho de Melo Date: Thu, 24 Jan 2013 19:10:42 +0000 (-0300) Subject: perf tools: Allow passing NULL to intlist__find X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5a3d04d6dc9050b4b4562f5c66aea23f0aa1c003;p=~shefty%2Frdma-dev.git 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 Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Mike Galbraith Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-e9tmvgdzehqrza11zs0nbg7g@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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);