summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
3f6517d)
This fixes the following Clang warning:
ctf-meta-resolve.c:278:28: error: implicit conversion from enumeration type 'enum ctf_scope' to different enumeration type 'enum bt_scope' [-Werror,-Wenum-conversion]
bt_common_scope_string(scope));
~~~~~~~~~~~~~~~~~~~~~~ ^~~~~
../../../../include/babeltrace/logging-internal.h:854:46: note: expanded from macro 'BT_LOGV'
BT_LOG_WRITE(BT_LOG_VERBOSE, _BT_LOG_TAG, __VA_ARGS__)
^~~~~~~~~~~
../../../../include/babeltrace/logging-internal.h:818:18: note: expanded from macro 'BT_LOG_WRITE'
lvl, tag, __VA_ARGS__); \
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
BT_LOGV("Prefix does not match: trying the next one: "
"path=\"%s\", path-prefix=\"%s\", scope=%s",
pathstr, absolute_path_prefixes[scope],
BT_LOGV("Prefix does not match: trying the next one: "
"path=\"%s\", path-prefix=\"%s\", scope=%s",
pathstr, absolute_path_prefixes[scope],
- bt_common_scope_string(scope));
+ ctf_scope_string(scope));
ret = scope;
BT_LOGV("Found root scope from absolute path: "
"path=\"%s\", scope=%s", pathstr,
ret = scope;
BT_LOGV("Found root scope from absolute path: "
"path=\"%s\", scope=%s", pathstr,
- bt_common_scope_string(scope));
+ ctf_scope_string(scope));
if (ctx->tc->is_translated) {
BT_LOGE("Trace class is already translated: "
"root-scope=%s",
if (ctx->tc->is_translated) {
BT_LOGE("Trace class is already translated: "
"root-scope=%s",
- bt_common_scope_string(field_path->root));
+ ctf_scope_string(field_path->root));
if (!ctx->sc) {
BT_LOGE("No current stream class: "
"root-scope=%s",
if (!ctx->sc) {
BT_LOGE("No current stream class: "
"root-scope=%s",
- bt_common_scope_string(field_path->root));
+ ctf_scope_string(field_path->root));
if (ctx->sc->is_translated) {
BT_LOGE("Stream class is already translated: "
"root-scope=%s",
if (ctx->sc->is_translated) {
BT_LOGE("Stream class is already translated: "
"root-scope=%s",
- bt_common_scope_string(field_path->root));
+ ctf_scope_string(field_path->root));
if (!ctx->ec) {
BT_LOGE("No current event class: "
"root-scope=%s",
if (!ctx->ec) {
BT_LOGE("No current event class: "
"root-scope=%s",
- bt_common_scope_string(field_path->root));
+ ctf_scope_string(field_path->root));
if (ctx->ec->is_translated) {
BT_LOGE("Event class is already translated: "
"root-scope=%s",
if (ctx->ec->is_translated) {
BT_LOGE("Event class is already translated: "
"root-scope=%s",
- bt_common_scope_string(field_path->root));
+ ctf_scope_string(field_path->root));
/* Error: root class is not available */
BT_LOGE("Root field class is not available: "
"root-scope=%s",
/* Error: root class is not available */
BT_LOGE("Root field class is not available: "
"root-scope=%s",
- bt_common_scope_string(field_path->root));
+ ctf_scope_string(field_path->root));
/* Relative path: start with current root scope */
field_path->root = ctx->root_scope;
BT_LOGV("Detected relative path: starting with current root scope: "
/* Relative path: start with current root scope */
field_path->root = ctx->root_scope;
BT_LOGV("Detected relative path: starting with current root scope: "
- "scope=%s", bt_common_scope_string(field_path->root));
+ "scope=%s", ctf_scope_string(field_path->root));
ret = relative_ptokens_to_field_path(ptokens, field_path, ctx);
if (ret) {
BT_LOGE("Cannot get relative field path of path string: "
"path=\"%s\", start-scope=%s, end-scope=%s",
ret = relative_ptokens_to_field_path(ptokens, field_path, ctx);
if (ret) {
BT_LOGE("Cannot get relative field path of path string: "
"path=\"%s\", start-scope=%s, end-scope=%s",
- pathstr, bt_common_scope_string(ctx->root_scope),
- bt_common_scope_string(field_path->root));
+ pathstr, ctf_scope_string(ctx->root_scope),
+ ctf_scope_string(field_path->root));
goto end;
}
} else {
/* Absolute path: use found root scope */
field_path->root = root_scope;
BT_LOGV("Detected absolute path: using root scope: "
goto end;
}
} else {
/* Absolute path: use found root scope */
field_path->root = root_scope;
BT_LOGV("Detected absolute path: using root scope: "
- "scope=%s", bt_common_scope_string(field_path->root));
+ "scope=%s", ctf_scope_string(field_path->root));
ret = absolute_ptokens_to_field_path(ptokens, field_path, ctx);
if (ret) {
BT_LOGE("Cannot get absolute field path of path string: "
"path=\"%s\", root-scope=%s",
ret = absolute_ptokens_to_field_path(ptokens, field_path, ctx);
if (ret) {
BT_LOGE("Cannot get absolute field path of path string: "
"path=\"%s\", root-scope=%s",
- pathstr, bt_common_scope_string(root_scope));
+ pathstr, ctf_scope_string(root_scope));
if (!fc) {
/* Error: root class is not available */
BT_LOGE("Root field class is not available: root-scope=%s",
if (!fc) {
/* Error: root class is not available */
BT_LOGE("Root field class is not available: root-scope=%s",
- bt_common_scope_string(field_path->root));
+ ctf_scope_string(field_path->root));
if (target_field_path->root > ctx_field_path.root) {
BT_LOGE("Target field class is located after source field class: "
"target-root=%s, source-root=%s",
if (target_field_path->root > ctx_field_path.root) {
BT_LOGE("Target field class is located after source field class: "
"target-root=%s, source-root=%s",
- bt_common_scope_string(target_field_path->root),
- bt_common_scope_string(ctx_field_path.root));
+ ctf_scope_string(target_field_path->root),
+ ctf_scope_string(ctx_field_path.root));