X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fevents.c;h=5d92b0872e418ceb69f473e4de3c969f11b96461;hp=06419a18cf6cff103a0891dcc1183b60bc1d444c;hb=b330165c14cce30cc7e97b27bc113194ec4fdd9b;hpb=03798a93f959f6c694fe98f5647481947607c604 diff --git a/formats/ctf/events.c b/formats/ctf/events.c index 06419a18..5d92b087 100644 --- a/formats/ctf/events.c +++ b/formats/ctf/events.c @@ -34,7 +34,7 @@ /* * thread local storage to store the last error that occured * while reading a field, this variable must be accessed by - * bt_ctf_field_error only + * bt_ctf_field_get_error only */ __thread int bt_ctf_last_field_error = 0; @@ -281,7 +281,7 @@ int bt_ctf_event_get_handle_id(const struct bt_ctf_event *ctf_event) return ret; } -uint64_t bt_ctf_get_real_timestamp(const struct bt_ctf_event *ctf_event) +uint64_t bt_ctf_get_timestamp(const struct bt_ctf_event *ctf_event) { struct ctf_event_definition *event = ctf_event->parent; if (event && event->stream->has_timestamp) @@ -290,7 +290,7 @@ uint64_t bt_ctf_get_real_timestamp(const struct bt_ctf_event *ctf_event) return -1ULL; } -uint64_t bt_ctf_get_cycles_timestamp(const struct bt_ctf_event *ctf_event) +uint64_t bt_ctf_get_cycles(const struct bt_ctf_event *ctf_event) { struct ctf_event_definition *event = ctf_event->parent; if (event && event->stream->has_timestamp) @@ -407,7 +407,7 @@ int bt_ctf_get_array_len(const struct definition *field) uint64_t bt_ctf_get_uint64(const struct definition *field) { - unsigned int ret = 0; + uint64_t ret = 0; if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER) ret = get_unsigned_int(field); @@ -419,7 +419,7 @@ uint64_t bt_ctf_get_uint64(const struct definition *field) int64_t bt_ctf_get_int64(const struct definition *field) { - int ret = 0; + int64_t ret = 0; if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER) ret = get_signed_int(field);