X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fbabeltrace-internal.h;h=1bdd79ece3ee19e6ca5b6005f9cf9ed21b6adf09;hb=b4565e8b2e0f7c0e356919fe95b760bed7a71d1b;hp=006bf8f3c7954618eb10fc9772ed6ce4822a6775;hpb=56b43721cde738dace9fc445bcf388e944686cbc;p=babeltrace.git

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index 006bf8f3..1bdd79ec 100644
--- a/include/babeltrace/babeltrace-internal.h
+++ b/include/babeltrace/babeltrace-internal.h
@@ -34,110 +34,6 @@
 
 #define PERROR_BUFLEN	200
 
-extern bt_bool babeltrace_verbose, babeltrace_debug;
-
-#define printf_verbose(fmt, args...)					\
-	do {								\
-		if (babeltrace_verbose)					\
-			fprintf(stdout, "[verbose] " fmt, ## args);	\
-	} while (0)
-
-#define printf_debug(fmt, args...)					\
-	do {								\
-		if (babeltrace_debug)					\
-			fprintf(stdout, "[debug] " fmt, ## args);	\
-	} while (0)
-
-#define _bt_printf(fp, kindstr, fmt, args...)				\
-	fprintf(fp, "[%s]%s%s%s: " fmt "\n",				\
-		kindstr,						\
-		babeltrace_debug ? " \"" : "",				\
-		babeltrace_debug ? __func__ : "",			\
-		babeltrace_debug ? "\"" : "",				\
-		## args)
-
-#define _bt_printfl(fp, kindstr, lineno, fmt, args...)			\
-	fprintf(fp, "[%s]%s%s%s at line %u: " fmt "\n",			\
-		kindstr,						\
-		babeltrace_debug ? " \"" : "",				\
-		babeltrace_debug ? __func__ : "",			\
-		babeltrace_debug ? "\"" : "",				\
-		lineno,							\
-		## args)
-
-#define _bt_printfe(fp, kindstr, perrorstr, fmt, args...)		\
-	fprintf(fp, "[%s]%s%s%s: %s: " fmt "\n",			\
-		kindstr,						\
-		babeltrace_debug ? " \"" : "",				\
-		babeltrace_debug ? __func__ : "",			\
-		babeltrace_debug ? "\"" : "",				\
-		perrorstr,						\
-		## args)
-
-#define _bt_printfle(fp, kindstr, lineno, perrorstr, fmt, args...)	\
-	fprintf(fp, "[%s]%s%s%s at line %u: %s: " fmt "\n",		\
-		kindstr,						\
-		babeltrace_debug ? " \"" : "",				\
-		babeltrace_debug ? __func__ : "",			\
-		babeltrace_debug ? "\"" : "",				\
-		lineno,							\
-		perrorstr,						\
-		## args)
-
-#define _bt_printf_perror(fp, fmt, args...)				\
-	({								\
-		const char *errstr;					\
-		errstr = g_strerror(errno);				\
-		_bt_printfe(fp, "error", errstr, fmt, ## args);		\
-	})
-
-#define _bt_printfl_perror(fp, lineno, fmt, args...)			\
-	({								\
-		const char *errstr;					\
-		errstr = g_strerror(errno);				\
-		_bt_printfle(fp, "error", lineno, errstr, fmt, ## args);\
-	})
-
-/* printf without lineno information */
-#define printf_fatal(fmt, args...)					\
-	_bt_printf(stderr, "fatal", fmt, ## args)
-#define printf_error(fmt, args...)					\
-	_bt_printf(stderr, "error", fmt, ## args)
-#define printf_warning(fmt, args...)					\
-	_bt_printf(stderr, "warning", fmt, ## args)
-#define printf_perror(fmt, args...)					\
-	_bt_printf_perror(stderr, fmt, ## args)
-
-/* printf with lineno information */
-#define printfl_fatal(lineno, fmt, args...)				\
-	_bt_printfl(stderr, "fatal", lineno, fmt, ## args)
-#define printfl_error(lineno, fmt, args...)				\
-	_bt_printfl(stderr, "error", lineno, fmt, ## args)
-#define printfl_warning(lineno, fmt, args...)				\
-	_bt_printfl(stderr, "warning", lineno, fmt, ## args)
-#define printfl_perror(lineno, fmt, args...)				\
-	_bt_printfl_perror(stderr, lineno, fmt, ## args)
-
-/* printf with node lineno information */
-#define printfn_fatal(node, fmt, args...)				\
-	_bt_printfl(stderr, "fatal", (node)->lineno, fmt, ## args)
-#define printfn_error(node, fmt, args...)				\
-	_bt_printfl(stderr, "error", (node)->lineno, fmt, ## args)
-#define printfn_warning(node, fmt, args...)				\
-	_bt_printfl(stderr, "warning", (node)->lineno, fmt, ## args)
-#define printfn_perror(node, fmt, args...)				\
-	_bt_printfl_perror(stderr, (node)->lineno, fmt, ## args)
-
-/* fprintf with Node lineno information */
-#define fprintfn_fatal(fp, node, fmt, args...)				\
-	_bt_printfl(fp, "fatal", (node)->lineno, fmt, ## args)
-#define fprintfn_error(fp, node, fmt, args...)				\
-	_bt_printfl(fp, "error", (node)->lineno, fmt, ## args)
-#define fprintfn_warning(fp, node, fmt, args...)			\
-	_bt_printfl(fp, "warning", (node)->lineno, fmt, ## args)
-#define fprintfn_perror(fp, node, fmt, args...)				\
-	_bt_printfl_perror(fp, (node)->lineno, fmt, ## args)
-
 #ifndef likely
 # ifdef __GNUC__
 #  define likely(x)      __builtin_expect(!!(x), 1)