From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756823AbcCXHon (ORCPT ); Thu, 24 Mar 2016 03:44:43 -0400 Received: from terminus.zytor.com ([198.137.202.10]:43400 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754250AbcCXHoj (ORCPT ); Thu, 24 Mar 2016 03:44:39 -0400 Date: Thu, 24 Mar 2016 00:44:25 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: adrian.hunter@intel.com, acme@redhat.com, wangnan0@huawei.com, namhyung@kernel.org, tglx@linutronix.de, jolsa@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org Reply-To: tglx@linutronix.de, namhyung@kernel.org, acme@redhat.com, wangnan0@huawei.com, adrian.hunter@intel.com, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org, jolsa@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf tools: Unexport some methods unused outside strbuf.c Git-Commit-ID: 0741208a7cd4fc651316f1f861ad9e83495765fc 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: 0741208a7cd4fc651316f1f861ad9e83495765fc Gitweb: http://git.kernel.org/tip/0741208a7cd4fc651316f1f861ad9e83495765fc Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 23 Mar 2016 16:56:56 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 23 Mar 2016 17:09:53 -0300 perf tools: Unexport some methods unused outside strbuf.c Cc: Adrian Hunter Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-nq1wvtky4mpu0nupjyar7sbw@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/strbuf.c | 9 ++++++++- tools/perf/util/strbuf.h | 7 +------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/strbuf.c b/tools/perf/util/strbuf.c index d3d2792..8fb7329 100644 --- a/tools/perf/util/strbuf.c +++ b/tools/perf/util/strbuf.c @@ -51,6 +51,13 @@ void strbuf_grow(struct strbuf *sb, size_t extra) ALLOC_GROW(sb->buf, sb->len + extra + 1, sb->alloc); } +void strbuf_addch(struct strbuf *sb, int c) +{ + strbuf_grow(sb, 1); + sb->buf[sb->len++] = c; + sb->buf[sb->len] = '\0'; +} + void strbuf_add(struct strbuf *sb, const void *data, size_t len) { strbuf_grow(sb, len); @@ -58,7 +65,7 @@ void strbuf_add(struct strbuf *sb, const void *data, size_t len) strbuf_setlen(sb, sb->len + len); } -void strbuf_addv(struct strbuf *sb, const char *fmt, va_list ap) +static void strbuf_addv(struct strbuf *sb, const char *fmt, va_list ap) { int len; va_list ap_saved; diff --git a/tools/perf/util/strbuf.h b/tools/perf/util/strbuf.h index b73cbaa..ab9be0fb 100644 --- a/tools/perf/util/strbuf.h +++ b/tools/perf/util/strbuf.h @@ -71,11 +71,7 @@ static inline void strbuf_setlen(struct strbuf *sb, size_t len) { } /*----- add data in your buffer -----*/ -static inline void strbuf_addch(struct strbuf *sb, int c) { - strbuf_grow(sb, 1); - sb->buf[sb->len++] = c; - sb->buf[sb->len] = '\0'; -} +void strbuf_addch(struct strbuf *sb, int c); void strbuf_add(struct strbuf *buf, const void *, size_t); static inline void strbuf_addstr(struct strbuf *sb, const char *s) { @@ -84,7 +80,6 @@ static inline void strbuf_addstr(struct strbuf *sb, const char *s) { __attribute__((format(printf,2,3))) void strbuf_addf(struct strbuf *sb, const char *fmt, ...); -void strbuf_addv(struct strbuf *sb, const char *fmt, va_list ap); /* XXX: if read fails, any partial read is undone */ ssize_t strbuf_read(struct strbuf *, int fd, ssize_t hint);