X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-parser-test.c;h=fed85f11466933e5eb592d30842ea98e943345e6;hb=8b596b57e1ff348a11b596b85278c17445e06afb;hp=e84dc1289c168c124c7e6109a47fc795b88b58cb;hpb=70bd0a12b09ce7f233189cf07e090fda593ebc48;p=babeltrace.git

diff --git a/formats/ctf/metadata/ctf-parser-test.c b/formats/ctf/metadata/ctf-parser-test.c
index e84dc128..fed85f11 100644
--- a/formats/ctf/metadata/ctf-parser-test.c
+++ b/formats/ctf/metadata/ctf-parser-test.c
@@ -14,20 +14,28 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <glib.h>
 #include <errno.h>
-#include <endian.h>
+#include <babeltrace/endian.h>
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/ctf/metadata.h>
 #include "ctf-scanner.h"
 #include "ctf-parser.h"
 #include "ctf-ast.h"
 
-int babeltrace_verbose, babeltrace_debug;
+bool babeltrace_verbose, babeltrace_debug;
 
 int main(int argc, char **argv)
 {
@@ -37,34 +45,34 @@ int main(int argc, char **argv)
 
 	babeltrace_debug = 1;
 	babeltrace_verbose = 1;
-	scanner = ctf_scanner_alloc(stdin);
+	scanner = ctf_scanner_alloc();
 	if (!scanner) {
-		fprintf(stdout, "Error allocating scanner\n");
+		fprintf(stderr, "Error allocating scanner\n");
 		return -ENOMEM;
 	}
-	ret = ctf_scanner_append_ast(scanner);
+	ret = ctf_scanner_append_ast(scanner, stdin);
 	if (ret) {
-		fprintf(stdout, "Error creating AST\n");
+		fprintf(stderr, "Error creating AST\n");
 		goto end;
 	}
 
-	ret = ctf_visitor_print_xml(stdout, 0, &scanner->ast->root);
+	ret = ctf_visitor_print_xml(stderr, 0, &scanner->ast->root);
 	if (ret) {
-		fprintf(stdout, "Error visiting AST for XML output\n");
+		fprintf(stderr, "Error visiting AST for XML output\n");
 		goto end;
 	}
 
-	ret = ctf_visitor_semantic_check(stdout, 0, &scanner->ast->root);
+	ret = ctf_visitor_semantic_check(stderr, 0, &scanner->ast->root);
 	if (ret) {
-		fprintf(stdout, "Error in CTF semantic validation %d\n", ret);
+		fprintf(stderr, "Error in CTF semantic validation %d\n", ret);
 		goto end;
 	}
 	trace = malloc(sizeof(*trace));
 	memset(trace, 0, sizeof(*trace));
-	ret = ctf_visitor_construct_metadata(stdout, 0, &scanner->ast->root,
+	ret = ctf_visitor_construct_metadata(stderr, 0, &scanner->ast->root,
 			trace, BYTE_ORDER);
 	if (ret) {
-		fprintf(stdout, "Error in CTF metadata constructor %d\n", ret);
+		fprintf(stderr, "Error in CTF metadata constructor %d\n", ret);
 		goto free_trace;
 	}
 free_trace: