X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace-log.c;h=bdb01f16f4b6e7d18f2f642ba3c3c5224072177a;hp=c6f751ea4d97b7353dd44341608ba1377a7007e9;hb=f77968f52cf4e04d08683a5f703c84dbaafb2d75;hpb=0d08ed29311a9f1381b2015fd609dd10fdcf284a

diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c
index c6f751ea..bdb01f16 100644
--- a/converter/babeltrace-log.c
+++ b/converter/babeltrace-log.c
@@ -28,13 +28,11 @@
  * Depends on glibc 2.10 for getline().
  */
 
-#define _GNU_SOURCE
-#include <config.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/mman.h>
-#include <dirent.h>
+#include <babeltrace/compat/dirent.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -108,7 +106,7 @@ void print_metadata(FILE *fp)
 	ret = sscanf(VERSION, "%u.%u", &major, &minor);
 	if (ret != 2)
 		fprintf(stderr, "[warning] Incorrect babeltrace version format\n.");
-	babeltrace_uuid_unparse(s_uuid, uuid_str);
+	bt_uuid_unparse(s_uuid, uuid_str);
 	fprintf(fp, metadata_fmt,
 		major,
 		minor,
@@ -318,7 +316,7 @@ void trace_text(FILE *input, int output)
 	struct ctf_stream_pos pos;
 	ssize_t len;
 	char *line = NULL, *nl;
-	size_t linesize;
+	size_t linesize = 0;
 	int ret;
 
 	memset(&pos, 0, sizeof(pos));
@@ -415,7 +413,7 @@ int main(int argc, char **argv)
 		perror("opendir");
 		goto error_rmdir;
 	}
-	dir_fd = dirfd(dir);
+	dir_fd = bt_dirfd(dir);
 	if (dir_fd < 0) {
 		perror("dirfd");
 		goto error_closedir;
@@ -440,7 +438,7 @@ int main(int argc, char **argv)
 		goto error_closemetadatafd;
 	}
 
-	babeltrace_uuid_generate(s_uuid);
+	bt_uuid_generate(s_uuid);
 	print_metadata(metadata_fp);
 	trace_text(stdin, fd);