tools lib traceevent: Get rid of die() finally!!

Now all of its users were gone. :)

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Reviewed-by: Jiri Olsa <jolsa@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1389750340-15965-5-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/lib/traceevent/event-utils.h b/tools/lib/traceevent/event-utils.h
index e76c9acb92cd5ab693ee70bc7851fffd237a4a4e..d1dc2170e4023dbf8cfec33b386bcecd15972035 100644 (file)
--- a/tools/lib/traceevent/event-utils.h
+++ b/tools/lib/traceevent/event-utils.h
@@ -23,18 +23,14 @@
 #include <ctype.h>
 
 /* Can be overridden */
-void die(const char *fmt, ...);
-void *malloc_or_die(unsigned int size);
 void warning(const char *fmt, ...);
 void pr_stat(const char *fmt, ...);
 void vpr_stat(const char *fmt, va_list ap);
 
 /* Always available */
-void __die(const char *fmt, ...);
 void __warning(const char *fmt, ...);
 void __pr_stat(const char *fmt, ...);
 
-void __vdie(const char *fmt, ...);
 void __vwarning(const char *fmt, ...);
 void __vpr_stat(const char *fmt, ...);
 

diff --git a/tools/lib/traceevent/parse-utils.c b/tools/lib/traceevent/parse-utils.c
index bba701cf10e6e28bf2efde0f2089c37131d88d01..eda07fa31dca1058a72989669e1cc99bc5958ab3 100644 (file)
--- a/tools/lib/traceevent/parse-utils.c
+++ b/tools/lib/traceevent/parse-utils.c
@@ -25,40 +25,6 @@
 
 #define __weak __attribute__((weak))
 
-void __vdie(const char *fmt, va_list ap)
-{
-       int ret = errno;
-
-       if (errno)
-               perror("trace-cmd");
-       else
-               ret = -1;
-
-       fprintf(stderr, "  ");
-       vfprintf(stderr, fmt, ap);
-
-       fprintf(stderr, "\n");
-       exit(ret);
-}
-
-void __die(const char *fmt, ...)
-{
-       va_list ap;
-
-       va_start(ap, fmt);
-       __vdie(fmt, ap);
-       va_end(ap);
-}
-
-void __weak die(const char *fmt, ...)
-{
-       va_list ap;
-
-       va_start(ap, fmt);
-       __vdie(fmt, ap);
-       va_end(ap);
-}
-
 void __vwarning(const char *fmt, va_list ap)
 {
        if (errno)
@@ -117,13 +83,3 @@ void __weak pr_stat(const char *fmt, ...)
        __vpr_stat(fmt, ap);
        va_end(ap);
 }
-
-void __weak *malloc_or_die(unsigned int size)
-{
-       void *data;
-
-       data = malloc(size);
-       if (!data)
-               die("malloc");
-       return data;
-}