Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
-int babeltrace_uuid_generate(unsigned char *uuid_out)
+int bt_uuid_generate(unsigned char *uuid_out)
-int babeltrace_uuid_unparse(const unsigned char *uuid_in, char *str_out)
+int bt_uuid_unparse(const unsigned char *uuid_in, char *str_out)
{
RPC_STATUS status;
unsigned char *alloc_str;
{
RPC_STATUS status;
unsigned char *alloc_str;
-int babeltrace_uuid_parse(const char *str_in, unsigned char *uuid_out)
+int bt_uuid_parse(const char *str_in, unsigned char *uuid_out)
-int babeltrace_uuid_compare(const unsigned char *uuid_a,
+int bt_uuid_compare(const unsigned char *uuid_a,
const unsigned char *uuid_b)
{
RPC_STATUS status;
const unsigned char *uuid_b)
{
RPC_STATUS status;
ret = sscanf(VERSION, "%u.%u", &major, &minor);
if (ret != 2)
fprintf(stderr, "[warning] Incorrect babeltrace version format\n.");
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,
fprintf(fp, metadata_fmt,
major,
minor,
goto error_closemetadatafd;
}
goto error_closemetadatafd;
}
- babeltrace_uuid_generate(s_uuid);
+ bt_uuid_generate(s_uuid);
print_metadata(metadata_fp);
trace_text(stdin, fd);
print_metadata(metadata_fp);
trace_text(stdin, fd);
memcpy(td->uuid, header.uuid, sizeof(header.uuid));
CTF_TRACE_SET_FIELD(td, uuid);
} else {
memcpy(td->uuid, header.uuid, sizeof(header.uuid));
CTF_TRACE_SET_FIELD(td, uuid);
} else {
- if (babeltrace_uuid_compare(header.uuid, td->uuid))
+ if (bt_uuid_compare(header.uuid, td->uuid))
elem = bt_array_index(defarray, i);
uuidval[i] = bt_get_unsigned_int(elem);
}
elem = bt_array_index(defarray, i);
uuidval[i] = bt_get_unsigned_int(elem);
}
- ret = babeltrace_uuid_compare(td->uuid, uuidval);
+ ret = bt_uuid_compare(td->uuid, uuidval);
if (ret) {
fprintf(stderr, "[error] Unique Universal Identifiers do not match.\n");
return -EINVAL;
if (ret) {
fprintf(stderr, "[error] Unique Universal Identifiers do not match.\n");
return -EINVAL;
- ret = babeltrace_uuid_generate(clock->uuid);
+ ret = bt_uuid_generate(clock->uuid);
|| i != 0)
return -EINVAL;
src_string = node->u.unary_expression.u.string;
|| i != 0)
return -EINVAL;
src_string = node->u.unary_expression.u.string;
- ret = babeltrace_uuid_parse(src_string, uuid);
+ ret = bt_uuid_parse(src_string, uuid);
goto error;
}
if (CTF_TRACE_FIELD_IS_SET(trace, uuid)
goto error;
}
if (CTF_TRACE_FIELD_IS_SET(trace, uuid)
- && babeltrace_uuid_compare(uuid, trace->uuid)) {
+ && bt_uuid_compare(uuid, trace->uuid)) {
fprintf(fd, "[error] %s: uuid mismatch\n", __func__);
ret = -EPERM;
goto error;
fprintf(fd, "[error] %s: uuid mismatch\n", __func__);
ret = -EPERM;
goto error;
#include <uuid/uuid.h>
static inline
#include <uuid/uuid.h>
static inline
-int babeltrace_uuid_generate(unsigned char *uuid_out)
+int bt_uuid_generate(unsigned char *uuid_out)
{
uuid_generate(uuid_out);
return 0;
{
uuid_generate(uuid_out);
return 0;
/* Sun's libuuid lacks const qualifiers */
#if defined(__sun__)
static inline
/* Sun's libuuid lacks const qualifiers */
#if defined(__sun__)
static inline
-int babeltrace_uuid_unparse(const unsigned char *uuid_in, char *str_out)
+int bt_uuid_unparse(const unsigned char *uuid_in, char *str_out)
{
uuid_unparse((unsigned char *) uuid_in, str_out);
return 0;
}
static inline
{
uuid_unparse((unsigned char *) uuid_in, str_out);
return 0;
}
static inline
-int babeltrace_uuid_parse(const char *str_in, unsigned char *uuid_out)
+int bt_uuid_parse(const char *str_in, unsigned char *uuid_out)
{
return uuid_parse((char *) str_in, uuid_out);
}
static inline
{
return uuid_parse((char *) str_in, uuid_out);
}
static inline
-int babeltrace_uuid_compare(const unsigned char *uuid_a,
+int bt_uuid_compare(const unsigned char *uuid_a,
const unsigned char *uuid_b)
{
return uuid_compare((unsigned char *) uuid_a,
const unsigned char *uuid_b)
{
return uuid_compare((unsigned char *) uuid_a,
-int babeltrace_uuid_unparse(const unsigned char *uuid_in, char *str_out)
+int bt_uuid_unparse(const unsigned char *uuid_in, char *str_out)
{
uuid_unparse(uuid_in, str_out);
return 0;
}
static inline
{
uuid_unparse(uuid_in, str_out);
return 0;
}
static inline
-int babeltrace_uuid_parse(const char *str_in, unsigned char *uuid_out)
+int bt_uuid_parse(const char *str_in, unsigned char *uuid_out)
{
return uuid_parse(str_in, uuid_out);
}
static inline
{
return uuid_parse(str_in, uuid_out);
}
static inline
-int babeltrace_uuid_compare(const unsigned char *uuid_a,
+int bt_uuid_compare(const unsigned char *uuid_a,
const unsigned char *uuid_b)
{
return uuid_compare(uuid_a, uuid_b);
}
#endif
const unsigned char *uuid_b)
{
return uuid_compare(uuid_a, uuid_b);
}
#endif
-#elif defined(BABELTRACE_HAVE_LIBC_UUID)
+#elif defined(BT_HAVE_LIBC_UUID)
#include <uuid.h>
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
static inline
#include <uuid.h>
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
static inline
-int babeltrace_uuid_generate(unsigned char *uuid_out)
+int bt_uuid_generate(unsigned char *uuid_out)
-int babeltrace_uuid_unparse(const unsigned char *uuid_in, char *str_out)
+int bt_uuid_unparse(const unsigned char *uuid_in, char *str_out)
{
uint32_t status;
char *alloc_str;
{
uint32_t status;
char *alloc_str;
-int babeltrace_uuid_parse(const char *str_in, unsigned char *uuid_out)
+int bt_uuid_parse(const char *str_in, unsigned char *uuid_out)
-int babeltrace_uuid_compare(const unsigned char *uuid_a,
+int bt_uuid_compare(const unsigned char *uuid_a,
const unsigned char *uuid_b)
{
uint32_t status;
const unsigned char *uuid_b)
{
uint32_t status;
#elif defined(__MINGW32__)
#elif defined(__MINGW32__)
-int babeltrace_uuid_generate(unsigned char *uuid_out);
-int babeltrace_uuid_unparse(const unsigned char *uuid_in, char *str_out);
-int babeltrace_uuid_parse(const char *str_in, unsigned char *uuid_out);
-int babeltrace_uuid_compare(const unsigned char *uuid_a,
+int bt_uuid_generate(unsigned char *uuid_out);
+int bt_uuid_unparse(const unsigned char *uuid_in, char *str_out);
+int bt_uuid_parse(const char *str_in, unsigned char *uuid_out);
+int bt_uuid_compare(const unsigned char *uuid_a,
const unsigned char *uuid_b);
#else
const unsigned char *uuid_b);
#else