From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754052AbbGUJc4 (ORCPT ); Tue, 21 Jul 2015 05:32:56 -0400 Received: from terminus.zytor.com ([198.137.202.10]:40122 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753972AbbGUJci (ORCPT ); Tue, 21 Jul 2015 05:32:38 -0400 Date: Tue, 21 Jul 2015 02:32:20 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: jolsa@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org, fweisbec@gmail.com, eranian@google.com, adrian.hunter@intel.com, acme@redhat.com, namhyung@kernel.org, tglx@linutronix.de, dsahern@gmail.com, bp@suse.de, hpa@zytor.com Reply-To: namhyung@kernel.org, hpa@zytor.com, tglx@linutronix.de, dsahern@gmail.com, bp@suse.de, fweisbec@gmail.com, jolsa@redhat.com, mingo@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com, eranian@google.com, adrian.hunter@intel.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf strlist: load() should return a negative errno Git-Commit-ID: ab7322af8c620987ed058e39506c97e5f2d3c65c X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: ab7322af8c620987ed058e39506c97e5f2d3c65c Gitweb: http://git.kernel.org/tip/ab7322af8c620987ed058e39506c97e5f2d3c65c Author: Arnaldo Carvalho de Melo AuthorDate: Thu, 16 Jul 2015 11:08:34 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 16 Jul 2015 11:08:34 -0300 perf strlist: load() should return a negative errno To match what its users return. Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-jntpe2lwg1fxn1bku7uccan0@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/strlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/strlist.c b/tools/perf/util/strlist.c index 71f9d10..68ae673 100644 --- a/tools/perf/util/strlist.c +++ b/tools/perf/util/strlist.c @@ -72,7 +72,7 @@ int strlist__load(struct strlist *slist, const char *filename) FILE *fp = fopen(filename, "r"); if (fp == NULL) - return errno; + return -errno; while (fgets(entry, sizeof(entry), fp) != NULL) { const size_t len = strlen(entry);