lkml.org 
[lkml]   [2016]   [Mar]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 21/23] perf tools: Unexport some methods unused outside strbuf.c
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Wang Nan <wangnan0@huawei.com>
    Link: http://lkml.kernel.org/n/tip-nq1wvtky4mpu0nupjyar7sbw@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    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 d3d279275432..8fb73295ec34 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 b73cbaaf93bc..ab9be0fbbd40 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);
    --
    2.5.5
    \
     
     \ /
      Last update: 2016-03-23 23:01    [W:4.442 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site