projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix/breakage API : replace bt_ctf_event
[babeltrace.git]
/
converter
/
babeltrace-log.c
diff --git
a/converter/babeltrace-log.c
b/converter/babeltrace-log.c
index ac66a8b08d878e2be09548be0320d2a3bb0321fc..6ac94e69236c3cb7f29d806aa0369b63bf5b2d4b 100644
(file)
--- a/
converter/babeltrace-log.c
+++ b/
converter/babeltrace-log.c
@@
-20,6
+20,7
@@
* Depends on glibc 2.10 for getline().
*/
* Depends on glibc 2.10 for getline().
*/
+#define _GNU_SOURCE
#include <config.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <config.h>
#include <sys/types.h>
#include <sys/stat.h>
@@
-31,13
+32,12
@@
#include <stdint.h>
#include <unistd.h>
#include <errno.h>
#include <stdint.h>
#include <unistd.h>
#include <errno.h>
-#include <uuid/uuid.h>
#include <string.h>
#include <string.h>
-#include <endian.h>
#include <babeltrace/babeltrace-internal.h>
#include <babeltrace/ctf/types.h>
#include <babeltrace/uuid.h>
#include <babeltrace/babeltrace-internal.h>
#include <babeltrace/ctf/types.h>
#include <babeltrace/uuid.h>
+#include <babeltrace/endian.h>
#define USEC_PER_SEC 1000000UL
#define USEC_PER_SEC 1000000UL
@@
-46,7
+46,7
@@
int babeltrace_debug, babeltrace_verbose;
static char *s_outputname;
static int s_timestamp;
static int s_help;
static char *s_outputname;
static int s_timestamp;
static int s_help;
-static u
uid_t s_uuid
;
+static u
nsigned char s_uuid[BABELTRACE_UUID_LEN]
;
/* Metadata format string */
static const char metadata_fmt[] =
/* Metadata format string */
static const char metadata_fmt[] =
@@
-104,7
+104,7
@@
void print_metadata(FILE *fp)
}
static
}
static
-void write_packet_header(struct ctf_stream_pos *pos, u
uid_t
uuid)
+void write_packet_header(struct ctf_stream_pos *pos, u
nsigned char *
uuid)
{
struct ctf_stream_pos dummy;
{
struct ctf_stream_pos dummy;
@@
-125,8
+125,8
@@
void write_packet_header(struct ctf_stream_pos *pos, uuid_t uuid)
assert(!ctf_pos_packet(&dummy));
ctf_align_pos(pos, sizeof(uint8_t) * CHAR_BIT);
assert(!ctf_pos_packet(&dummy));
ctf_align_pos(pos, sizeof(uint8_t) * CHAR_BIT);
- memcpy(ctf_get_pos_addr(pos), uuid,
16
);
- ctf_move_pos(pos,
16
* CHAR_BIT);
+ memcpy(ctf_get_pos_addr(pos), uuid,
BABELTRACE_UUID_LEN
);
+ ctf_move_pos(pos,
BABELTRACE_UUID_LEN
* CHAR_BIT);
}
static
}
static
@@
-337,7
+337,7
@@
int main(int argc, char **argv)
goto error_closemetadatafd;
}
goto error_closemetadatafd;
}
- uuid_generate(s_uuid);
+
babeltrace_
uuid_generate(s_uuid);
print_metadata(metadata_fp);
trace_text(stdin, fd);
print_metadata(metadata_fp);
trace_text(stdin, fd);
This page took
0.023849 seconds
and
4
git commands to generate.