From: Jérémie Galarneau Date: Tue, 13 Oct 2015 20:36:56 +0000 (-0400) Subject: Change UUID API prefix from babeltrace_ to bt_ X-Git-Tag: v1.3.0~31 X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=72a3bc16d8ecc59e593f5cfec4622cbc7fb2f3fc Change UUID API prefix from babeltrace_ to bt_ Signed-off-by: Jérémie Galarneau --- diff --git a/compat/compat_uuid.c b/compat/compat_uuid.c index 6216f799..a775da47 100644 --- a/compat/compat_uuid.c +++ b/compat/compat_uuid.c @@ -48,7 +48,7 @@ void fix_uuid_endian(unsigned char * ptr) swap(ptr, 6, 7) } -int babeltrace_uuid_generate(unsigned char *uuid_out) +int bt_uuid_generate(unsigned char *uuid_out) { RPC_STATUS status; @@ -59,7 +59,7 @@ int babeltrace_uuid_generate(unsigned char *uuid_out) return -1; } -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; @@ -83,7 +83,7 @@ int babeltrace_uuid_unparse(const unsigned char *uuid_in, char *str_out) return ret; } -int babeltrace_uuid_parse(const char *str_in, unsigned char *uuid_out) +int bt_uuid_parse(const char *str_in, unsigned char *uuid_out) { RPC_STATUS status; @@ -97,7 +97,7 @@ int babeltrace_uuid_parse(const char *str_in, unsigned char *uuid_out) return -1; } -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; diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c index c6f751ea..b724ccd6 100644 --- a/converter/babeltrace-log.c +++ b/converter/babeltrace-log.c @@ -108,7 +108,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, @@ -440,7 +440,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); diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index a32e0cc0..865e2c2e 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -1109,7 +1109,7 @@ int ctf_trace_metadata_packet_read(struct ctf_trace *td, FILE *in, 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)) return -EINVAL; } @@ -1595,7 +1595,7 @@ begin: 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; diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c index 5f47930f..4b171984 100644 --- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c +++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c @@ -255,7 +255,7 @@ int get_unary_uuid(struct bt_list_head *head, unsigned char *uuid) || 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); } return ret; } @@ -2178,7 +2178,7 @@ int ctf_trace_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru 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; diff --git a/include/babeltrace/compat/uuid.h b/include/babeltrace/compat/uuid.h index 80e65260..65a72704 100644 --- a/include/babeltrace/compat/uuid.h +++ b/include/babeltrace/compat/uuid.h @@ -35,7 +35,7 @@ #include static inline -int babeltrace_uuid_generate(unsigned char *uuid_out) +int bt_uuid_generate(unsigned char *uuid_out) { uuid_generate(uuid_out); return 0; @@ -44,20 +44,20 @@ int babeltrace_uuid_generate(unsigned char *uuid_out) /* 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 -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 -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, @@ -65,34 +65,34 @@ int babeltrace_uuid_compare(const unsigned char *uuid_a, } #else 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(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 -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 -#elif defined(BABELTRACE_HAVE_LIBC_UUID) +#elif defined(BT_HAVE_LIBC_UUID) #include #include #include #include static inline -int babeltrace_uuid_generate(unsigned char *uuid_out) +int bt_uuid_generate(unsigned char *uuid_out) { uint32_t status; @@ -104,7 +104,7 @@ int babeltrace_uuid_generate(unsigned char *uuid_out) } 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) { uint32_t status; char *alloc_str; @@ -122,7 +122,7 @@ int babeltrace_uuid_unparse(const unsigned char *uuid_in, char *str_out) } 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) { uint32_t status; @@ -134,7 +134,7 @@ int babeltrace_uuid_parse(const char *str_in, unsigned char *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) { uint32_t status; @@ -148,10 +148,10 @@ int babeltrace_uuid_compare(const unsigned char *uuid_a, #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