- (babeltrace_debug ? " \"" : ""), \
- (babeltrace_debug ? __func__ : ""), \
- (babeltrace_debug ? "\"" : ""), \
+ 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 ? "\"" : "", \