Re: [PATCH 5/5] tools lib traceevent: Get rid of die() finally!!

2014-01-06 Thread Steven Rostedt
On Tue,  7 Jan 2014 12:00:12 +0900
Namhyung Kim  wrote:

> Now all of its users were gone. :)
> 

Die die!

;-)

-- Steve
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH 5/5] tools lib traceevent: Get rid of die() finally!!

2014-01-06 Thread Namhyung Kim
Now all of its users were gone. :)

Signed-off-by: Namhyung Kim 
---
 tools/lib/traceevent/event-utils.h |  4 
 tools/lib/traceevent/parse-utils.c | 44 --
 2 files changed, 48 deletions(-)

diff --git a/tools/lib/traceevent/event-utils.h 
b/tools/lib/traceevent/event-utils.h
index 5dc0aec5ab50..496dba9fe984 100644
--- a/tools/lib/traceevent/event-utils.h
+++ b/tools/lib/traceevent/event-utils.h
@@ -23,18 +23,14 @@
 #include 
 
 /* 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 bba701cf10e6..eda07fa31dca 100644
--- 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;
-}
-- 
1.7.11.7

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/