X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fctf-writer%2Fctf_writer.c;h=e113eea8dea9468616b1acfc392af291639d6550;hb=02bb4fcc399072b657877925489f4b4e43754a57;hp=91b2e6337d406cde49b4dbac3199b223617dbb88;hpb=2242b43d4f50ebdeabb124154fb8ac602c563536;p=babeltrace.git

diff --git a/tests/ctf-writer/ctf_writer.c b/tests/ctf-writer/ctf_writer.c
index 91b2e633..e113eea8 100644
--- a/tests/ctf-writer/ctf_writer.c
+++ b/tests/ctf-writer/ctf_writer.c
@@ -97,7 +97,7 @@ void validate_trace(char *parser_path, char *trace_path)
 {
 	int ret = 0;
 	gint exit_status;
-	char *argv[] = {parser_path, trace_path, "-o", "dummy", NULL};
+	const char *argv[] = {parser_path, trace_path, "-o", "dummy", NULL};
 
 	if (!parser_path || !trace_path) {
 		ret = -1;
@@ -105,7 +105,7 @@ void validate_trace(char *parser_path, char *trace_path)
 	}
 
 	if (!g_spawn_sync(NULL,
-			argv,
+			(gchar **) argv,
 			NULL,
 			G_SPAWN_STDOUT_TO_DEV_NULL,
 			NULL,
@@ -681,7 +681,7 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class,
 		"bt_ctf_event_class_get_stream_class returns the correct stream class");
 	bt_ctf_object_put_ref(ret_stream_class);
 
-	ok(bt_ctf_event_class_get_field_by_name(event_class, "truie") == NULL,
+	ok(!bt_ctf_event_class_get_field_by_name(event_class, "truie"),
 		"bt_ctf_event_class_get_field_by_name handles an invalid field name correctly");
 	ret_field_type = bt_ctf_event_class_get_field_by_name(event_class,
 		"complex_structure");
@@ -836,7 +836,7 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class,
 }
 
 static
-void type_field_tests()
+void type_field_tests(void)
 {
 	struct bt_ctf_field *uint_12;
 	struct bt_ctf_field *int_16;
@@ -1217,7 +1217,7 @@ void test_empty_stream(struct bt_ctf_writer *writer)
 	ret = bt_ctf_stream_class_set_event_header_type(stream_class, NULL);
 	BT_ASSERT(ret == 0);
 
-	ok(bt_ctf_stream_class_get_trace(stream_class) == NULL,
+	ok(!bt_ctf_stream_class_get_trace(stream_class),
 		"bt_ctf_stream_class_get_trace returns NULL when stream class is orphaned");
 
 	stream = bt_ctf_writer_create_stream(writer, stream_class);
@@ -1711,7 +1711,7 @@ int main(int argc, char **argv)
 		name.machine);
 
 	/* Define a clock and add it to the trace */
-	ok(bt_ctf_clock_create("signed") == NULL,
+	ok(!bt_ctf_clock_create("signed"),
 		"Illegal clock name rejected");
 	clock = bt_ctf_clock_create(clock_name);
 	ok(clock, "Clock created sucessfully");
@@ -1798,9 +1798,9 @@ int main(int argc, char **argv)
 	ok(ret_string && strcmp(ret_string, "test_stream") == 0,
 		"bt_ctf_stream_class_get_name returns a correct stream class name");
 
-	ok(bt_ctf_stream_class_get_clock(stream_class) == NULL,
+	ok(!bt_ctf_stream_class_get_clock(stream_class),
 		"bt_ctf_stream_class_get_clock returns NULL when a clock was not set");
-	ok(bt_ctf_stream_class_get_clock(NULL) == NULL,
+	ok(!bt_ctf_stream_class_get_clock(NULL),
 		"bt_ctf_stream_class_get_clock handles NULL correctly");
 
 	ok(stream_class, "Create stream class");
@@ -2001,7 +2001,7 @@ int main(int argc, char **argv)
 		"Changes to a stream class that was already instantiated fail");
 
 	/* Populate the custom packet header field only once for all tests */
-	ok(bt_ctf_stream_get_packet_header(NULL) == NULL,
+	ok(!bt_ctf_stream_get_packet_header(NULL),
 		"bt_ctf_stream_get_packet_header handles NULL correctly");
 	packet_header = bt_ctf_stream_get_packet_header(stream1);
 	ok(packet_header,