Fix erroneous use of "-n" for additional fields, add "-f"

[babeltrace.git] / include / babeltrace / babeltrace-internal.h

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index a329cc939192012bdb5c0979aa51fb6fe6fed9ca..ebeb048e6f4951c45f5ce6673e40467fdbc80e58 100644 (file)
--- a/include/babeltrace/babeltrace-internal.h
+++ b/include/babeltrace/babeltrace-internal.h
@@ -6,16 +6,16 @@
 
 extern int babeltrace_verbose, babeltrace_debug;
 
-#define printf_verbose(fmt, args...)                           \
-       do {                                                    \
-               if (babeltrace_verbose)                         \
-                       printf("[verbose] " fmt, ## args);      \
+#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)                           \
-                       printf("[debug] " fmt, ## args);        \
+#define printf_debug(fmt, args...)                                     \
+       do {                                                            \
+               if (babeltrace_debug)                                   \
+                       fprintf(stdout, "[debug] " fmt, ## args);       \
        } while (0)
 
 #define likely(x)      __builtin_expect(!!(x), 1)
@@ -23,17 +23,20 @@ extern int babeltrace_verbose, babeltrace_debug;
 
 struct trace_descriptor;
 struct trace_collection {
-       GPtrArray *array;
+       GPtrArray *array; /* struct trace_descriptor */
 };
 
-int convert_trace(struct trace_descriptor *td_write,
-                 struct trace_collection *trace_collection_read);
-
 extern int opt_all_field_names,
        opt_scope_field_names,
        opt_header_field_names,
        opt_context_field_names,
        opt_payload_field_names,
-       opt_trace_name;
+       opt_all_fields,
+       opt_trace_field,
+       opt_trace_domain_field,
+       opt_trace_procname_field,
+       opt_trace_vpid_field,
+       opt_loglevel_field,
+       opt_delta_field;
 
 #endif