X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=tests%2Flib%2Ftest_ctf_writer.c;h=0e4219c532281d016967e78e108036146ebac967;hp=0927a325cc0a06ab7b071b554d760ff5a4e8aa2b;hb=0954670a32efeaa4a5ffe1f24c9a31fe0ab6744c;hpb=024e61817685a20caceb4e3ef3bdc019a7af6b6e

diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c
index 0927a325..0e4219c5 100644
--- a/tests/lib/test_ctf_writer.c
+++ b/tests/lib/test_ctf_writer.c
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/utsname.h>
-#include <limits.h>
+#include <babeltrace/compat/limits.h>
 #include <string.h>
 #include <assert.h>
 #include <unistd.h>
@@ -621,7 +621,7 @@ void type_field_tests()
 	ok(!enumeration_array_type,
 		"Check enumeration types are validated when creating an array");
 	ok(bt_ctf_field_type_structure_add_field(composite_structure_type,
-		enumeration_type, "enumeration") == 0,
+		enumeration_type, "enumeration"),
 		"Check enumeration types are validated when adding them as structure members");
 	enumeration = bt_ctf_field_create(enumeration_type);
 	ok(!enumeration,
@@ -715,10 +715,11 @@ int main(int argc, char **argv)
 	char *metadata_string;
 	struct bt_ctf_writer *writer;
 	struct utsname name;
-	char hostname[HOST_NAME_MAX];
+	char hostname[BABELTRACE_HOST_NAME_MAX];
 	struct bt_ctf_clock *clock;
 	struct bt_ctf_stream_class *stream_class;
 	struct bt_ctf_stream *stream1;
+	int ret;
 
 	if (argc < 3) {
 		printf("Usage: tests-ctf-writer path_to_ctf_parser_test path_to_babeltrace\n");
@@ -738,7 +739,10 @@ int main(int argc, char **argv)
 	ok(writer, "bt_ctf_create succeeds in creating trace with path");
 
 	/* Add environment context to the trace */
-	gethostname(hostname, HOST_NAME_MAX);
+	ret = gethostname(hostname, sizeof(hostname));
+	if (ret < 0) {
+		return ret;
+	}
 	ok(bt_ctf_writer_add_environment_field(writer, "host", hostname) == 0,
 		"Add host (%s) environment field to writer instance",
 		hostname);