projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add bt_common_abort() and use it instead of abort() directly
[babeltrace.git]
/
src
/
ctf-writer
/
writer.c
diff --git
a/src/ctf-writer/writer.c
b/src/ctf-writer/writer.c
index 6c72acaf5f808928326e4468d1dbebaf3376878c..e3f5b326dd442746bc975bd462521fd53819037a 100644
(file)
--- a/
src/ctf-writer/writer.c
+++ b/
src/ctf-writer/writer.c
@@
-37,12
+37,12
@@
#include <sys/stat.h>
#include <unistd.h>
#include <sys/stat.h>
#include <unistd.h>
-#include <babeltrace2
/
ctf-writer/object.h>
+#include <babeltrace2
-
ctf-writer/object.h>
#include "common/assert.h"
#include "compat/compiler.h"
#include "compat/endian.h"
#include "common/assert.h"
#include "compat/compiler.h"
#include "compat/endian.h"
-#include "com
pat
/uuid.h"
+#include "com
mon
/uuid.h"
#include "clock.h"
#include "fields.h"
#include "clock.h"
#include "fields.h"
@@
-109,7
+109,7
@@
struct bt_ctf_writer *bt_ctf_writer_create(const char *path)
{
int ret;
struct bt_ctf_writer *writer = NULL;
{
int ret;
struct bt_ctf_writer *writer = NULL;
-
unsigned char uuid[16]
;
+
bt_uuid_t uuid
;
char *metadata_path = NULL;
if (!path) {
char *metadata_path = NULL;
if (!path) {
@@
-140,11
+140,7
@@
struct bt_ctf_writer *bt_ctf_writer_create(const char *path)
}
/* Generate a UUID for this writer's trace */
}
/* Generate a UUID for this writer's trace */
- ret = bt_uuid_generate(uuid);
- if (ret) {
- BT_LOGE_STR("Cannot generate UUID for CTF writer's trace.");
- goto error_destroy;
- }
+ bt_uuid_generate(uuid);
ret = bt_ctf_trace_set_uuid(writer->trace, uuid);
if (ret) {
ret = bt_ctf_trace_set_uuid(writer->trace, uuid);
if (ret) {
@@
-156,7
+152,7
@@
struct bt_ctf_writer *bt_ctf_writer_create(const char *path)
/* Default to little-endian */
ret = bt_ctf_writer_set_byte_order(writer, BT_CTF_BYTE_ORDER_NATIVE);
/* Default to little-endian */
ret = bt_ctf_writer_set_byte_order(writer, BT_CTF_BYTE_ORDER_NATIVE);
- BT_ASSERT(ret == 0);
+ BT_ASSERT
_DBG
(ret == 0);
/* Create trace directory if necessary and open a metadata file */
if (g_mkdir_with_parents(path, S_IRWXU | S_IRWXG)) {
/* Create trace directory if necessary and open a metadata file */
if (g_mkdir_with_parents(path, S_IRWXU | S_IRWXG)) {
@@
-221,7
+217,7
@@
struct bt_ctf_stream *bt_ctf_writer_create_stream(struct bt_ctf_writer *writer,
{
struct bt_ctf_stream *stream = NULL;
int stream_class_count;
{
struct bt_ctf_stream *stream = NULL;
int stream_class_count;
- bt_
bool stream_class_found = BT
_FALSE;
+ bt_
ctf_bool stream_class_found = BT_CTF
_FALSE;
int i;
if (!writer || !stream_class) {
int i;
if (!writer || !stream_class) {
@@
-240,7
+236,7
@@
struct bt_ctf_stream *bt_ctf_writer_create_stream(struct bt_ctf_writer *writer,
writer->trace, i);
if (existing_stream_class == stream_class) {
writer->trace, i);
if (existing_stream_class == stream_class) {
- stream_class_found = BT_TRUE;
+ stream_class_found = BT_
CTF_
TRUE;
}
BT_CTF_OBJECT_PUT_REF_AND_RESET(existing_stream_class);
}
BT_CTF_OBJECT_PUT_REF_AND_RESET(existing_stream_class);
@@
-451,7
+447,7
@@
const char *bt_ctf_get_byte_order_string(enum bt_ctf_byte_order byte_order)
string = "native";
break;
default:
string = "native";
break;
default:
- abort();
+
bt_common_
abort();
}
return string;
}
return string;
This page took
0.02727 seconds
and
4
git commands to generate.