From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754836AbbISNER (ORCPT ); Sat, 19 Sep 2015 09:04:17 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:37249 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753318AbbISNDm (ORCPT ); Sat, 19 Sep 2015 09:03:42 -0400 From: Alex Snast To: Arnaldo Carvalho de Melo Cc: Ingo Molnar , Peter Zijlstra , linux-kernel@vger.kernel.org, Alex Snast Subject: [PATCH 2/2] perf tools: Use rb_entry_safe on first / next symbol lookup Date: Sat, 19 Sep 2015 16:03:35 +0300 Message-Id: <1442667815-10749-2-git-send-email-asnast@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1442667815-10749-1-git-send-email-asnast@gmail.com> References: <1442667815-10749-1-git-send-email-asnast@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Alex Snast --- tools/perf/util/symbol.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 8b3608c..5728121 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -344,20 +344,14 @@ static struct symbol *symbols__first(struct rb_root *symbols) { struct rb_node *n = rb_first(symbols); - if (n) - return rb_entry(n, struct symbol, rb_node); - - return NULL; + return rb_entry_safe(n, struct symbol, rb_node); } static struct symbol *symbols__next(struct symbol *sym) { struct rb_node *n = rb_next(&sym->rb_node); - if (n) - return rb_entry(n, struct symbol, rb_node); - - return NULL; + return rb_entry_safe(n, struct symbol, rb_node); } struct symbol_name_rb_node { -- 2.1.4