Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e825e756 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

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



Now all of its users were gone. :)

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Reviewed-by: default avatarJiri 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 504586e0

tools/lib/traceevent/event-utils.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -23,18 +23,14 @@ 
#include <ctype.h>

#include <ctype.h>





/* Can be overridden */

/* Can be overridden */

void die(const char *fmt, ...);

void *malloc_or_die(unsigned int size);

void warning(const char *fmt, ...);

void warning(const char *fmt, ...);

void pr_stat(const char *fmt, ...);

void pr_stat(const char *fmt, ...);

void vpr_stat(const char *fmt, va_list ap);

void vpr_stat(const char *fmt, va_list ap);





/* Always available */

/* Always available */

void __die(const char *fmt, ...);

void __warning(const char *fmt, ...);

void __warning(const char *fmt, ...);

void __pr_stat(const char *fmt, ...);

void __pr_stat(const char *fmt, ...);





void __vdie(const char *fmt, ...);

void __vwarning(const char *fmt, ...);

void __vwarning(const char *fmt, ...);

void __vpr_stat(const char *fmt, ...);

void __vpr_stat(const char *fmt, ...);

tools/lib/traceevent/parse-utils.c

+0 −44
Original line number Original line Diff line number Diff line
@@ -25,40 +25,6 @@ 




#define __weak __attribute__((weak))

#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)

void __vwarning(const char *fmt, va_list ap)

{

{

	if (errno)

	if (errno)
@@ -117,13 +83,3 @@ void __weak pr_stat(const char *fmt, ...) 
	__vpr_stat(fmt, ap);

	__vpr_stat(fmt, ap);

	va_end(ap);

	va_end(ap);

}
 
}
 


void __weak *malloc_or_die(unsigned int size)

{

	void *data;



	data = malloc(size);

	if (!data)

		die("malloc");

	return data;

}