lkml.org 
[lkml]   [2010]   [Mar]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/3] perf tools: Move the prototypes in util/string.h to util.h
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    So that we avoid conflict with libc's string.h header.

    Suggested-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Cc: Frédéric Weisbecker <fweisbec@gmail.com>
    Cc: Mike Galbraith <efault@gmx.de>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/Makefile | 1 -
    tools/perf/bench/mem-memcpy.c | 1 -
    tools/perf/builtin-annotate.c | 1 -
    tools/perf/builtin-record.c | 1 -
    tools/perf/builtin-report.c | 1 -
    tools/perf/builtin-timechart.c | 1 -
    tools/perf/perf.c | 1 -
    tools/perf/util/string.h | 16 ----------------
    tools/perf/util/util.h | 11 +++++++++++
    9 files changed, 11 insertions(+), 23 deletions(-)
    delete mode 100644 tools/perf/util/string.h

    diff --git a/tools/perf/Makefile b/tools/perf/Makefile
    index 6903645..b474641 100644
    --- a/tools/perf/Makefile
    +++ b/tools/perf/Makefile
    @@ -377,7 +377,6 @@ LIB_H += util/header.h
    LIB_H += util/help.h
    LIB_H += util/session.h
    LIB_H += util/strbuf.h
    -LIB_H += util/string.h
    LIB_H += util/strlist.h
    LIB_H += util/svghelper.h
    LIB_H += util/run-command.h
    diff --git a/tools/perf/bench/mem-memcpy.c b/tools/perf/bench/mem-memcpy.c
    index 8977317..52e646e 100644
    --- a/tools/perf/bench/mem-memcpy.c
    +++ b/tools/perf/bench/mem-memcpy.c
    @@ -10,7 +10,6 @@
    #include "../perf.h"
    #include "../util/util.h"
    #include "../util/parse-options.h"
    -#include "../util/string.h"
    #include "../util/header.h"
    #include "bench.h"

    diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
    index 887e8e0..ee0d917 100644
    --- a/tools/perf/builtin-annotate.c
    +++ b/tools/perf/builtin-annotate.c
    @@ -14,7 +14,6 @@
    #include "util/cache.h"
    #include <linux/rbtree.h>
    #include "util/symbol.h"
    -#include "util/string.h"

    #include "perf.h"
    #include "util/debug.h"
    diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
    index 60ecdd3..99f6978 100644
    --- a/tools/perf/builtin-record.c
    +++ b/tools/perf/builtin-record.c
    @@ -15,7 +15,6 @@
    #include "util/util.h"
    #include "util/parse-options.h"
    #include "util/parse-events.h"
    -#include "util/string.h"

    #include "util/header.h"
    #include "util/event.h"
    diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
    index 6ab1698..3ab6d9e 100644
    --- a/tools/perf/builtin-report.c
    +++ b/tools/perf/builtin-report.c
    @@ -14,7 +14,6 @@
    #include "util/cache.h"
    #include <linux/rbtree.h>
    #include "util/symbol.h"
    -#include "util/string.h"
    #include "util/callchain.h"
    #include "util/strlist.h"
    #include "util/values.h"
    diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
    index 0d4d8ff..266e7aa 100644
    --- a/tools/perf/builtin-timechart.c
    +++ b/tools/perf/builtin-timechart.c
    @@ -21,7 +21,6 @@
    #include "util/cache.h"
    #include <linux/rbtree.h>
    #include "util/symbol.h"
    -#include "util/string.h"
    #include "util/callchain.h"
    #include "util/strlist.h"

    diff --git a/tools/perf/perf.c b/tools/perf/perf.c
    index 2826e70..d4be55b 100644
    --- a/tools/perf/perf.c
    +++ b/tools/perf/perf.c
    @@ -13,7 +13,6 @@
    #include "util/quote.h"
    #include "util/run-command.h"
    #include "util/parse-events.h"
    -#include "util/string.h"
    #include "util/debugfs.h"

    bool use_browser;
    diff --git a/tools/perf/util/string.h b/tools/perf/util/string.h
    deleted file mode 100644
    index 7005824..0000000
    --- a/tools/perf/util/string.h
    +++ /dev/null
    @@ -1,16 +0,0 @@
    -#ifndef __PERF_STRING_H_
    -#define __PERF_STRING_H_
    -
    -#include <stdbool.h>
    -#include "types.h"
    -
    -s64 perf_atoll(const char *str);
    -char **argv_split(const char *str, int *argcp);
    -void argv_free(char **argv);
    -bool strglobmatch(const char *str, const char *pat);
    -bool strlazymatch(const char *str, const char *pat);
    -
    -#define _STR(x) #x
    -#define STR(x) _STR(x)
    -
    -#endif /* __PERF_STRING_H */
    diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
    index 5270108..da450f0 100644
    --- a/tools/perf/util/util.h
    +++ b/tools/perf/util/util.h
    @@ -48,6 +48,7 @@
    #include <sys/stat.h>
    #include <sys/statfs.h>
    #include <fcntl.h>
    +#include <stdbool.h>
    #include <stddef.h>
    #include <stdlib.h>
    #include <stdarg.h>
    @@ -78,6 +79,7 @@
    #include <pwd.h>
    #include <inttypes.h>
    #include "../../../include/linux/magic.h"
    +#include "types.h"


    #ifndef NO_ICONV
    @@ -415,4 +417,13 @@ void git_qsort(void *base, size_t nmemb, size_t size,
    int mkdir_p(char *path, mode_t mode);
    int copyfile(const char *from, const char *to);

    +s64 perf_atoll(const char *str);
    +char **argv_split(const char *str, int *argcp);
    +void argv_free(char **argv);
    +bool strglobmatch(const char *str, const char *pat);
    +bool strlazymatch(const char *str, const char *pat);
    +
    +#define _STR(x) #x
    +#define STR(x) _STR(x)
    +
    #endif
    --
    1.6.2.5
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2010-03-26 21:41    [W:0.033 / U:88.916 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site