projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename: "field class ID" -> "field class type"
[babeltrace.git]
/
plugins
/
text
/
pretty
/
print.c
diff --git
a/plugins/text/pretty/print.c
b/plugins/text/pretty/print.c
index 921c28d8c6ec778968df53a201a06aea42a58708..f4f7a5868c08eb970deba6dd699370ec3c989b08 100644
(file)
--- a/
plugins/text/pretty/print.c
+++ b/
plugins/text/pretty/print.c
@@
-556,13
+556,13
@@
enum bt_component_status print_integer(struct pretty_component *pretty,
int64_t s;
} v;
bool rst_color = false;
int64_t s;
} v;
bool rst_color = false;
- enum bt_field_class_
id ft_id
;
+ enum bt_field_class_
type ft_type
;
int_fc = bt_field_borrow_class(field);
BT_ASSERT(int_fc);
int_fc = bt_field_borrow_class(field);
BT_ASSERT(int_fc);
- ft_
id = bt_field_get_class_id
(field);
- if (ft_
id == BT_FIELD_CLASS_ID
_UNSIGNED_INTEGER ||
- ft_
id == BT_FIELD_CLASS_ID
_UNSIGNED_ENUMERATION) {
+ ft_
type = bt_field_get_class_type
(field);
+ if (ft_
type == BT_FIELD_CLASS_TYPE
_UNSIGNED_INTEGER ||
+ ft_
type == BT_FIELD_CLASS_TYPE
_UNSIGNED_ENUMERATION) {
v.u = bt_field_unsigned_integer_get_value(field);
} else {
v.s = bt_field_signed_integer_get_value(field);
v.u = bt_field_unsigned_integer_get_value(field);
} else {
v.s = bt_field_signed_integer_get_value(field);
@@
-590,8
+590,8
@@
enum bt_component_status print_integer(struct pretty_component *pretty,
}
case BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_OCTAL:
{
}
case BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_OCTAL:
{
- if (ft_
id == BT_FIELD_CLASS_ID
_SIGNED_INTEGER ||
- ft_
id == BT_FIELD_CLASS_ID
_SIGNED_ENUMERATION) {
+ if (ft_
type == BT_FIELD_CLASS_TYPE
_SIGNED_INTEGER ||
+ ft_
type == BT_FIELD_CLASS_TYPE
_SIGNED_ENUMERATION) {
int len;
len = bt_field_class_integer_get_field_value_range(
int len;
len = bt_field_class_integer_get_field_value_range(
@@
-610,8
+610,8
@@
enum bt_component_status print_integer(struct pretty_component *pretty,
break;
}
case BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_DECIMAL:
break;
}
case BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_DECIMAL:
- if (ft_
id == BT_FIELD_CLASS_ID
_UNSIGNED_INTEGER ||
- ft_
id == BT_FIELD_CLASS_ID
_UNSIGNED_ENUMERATION) {
+ if (ft_
type == BT_FIELD_CLASS_TYPE
_UNSIGNED_INTEGER ||
+ ft_
type == BT_FIELD_CLASS_TYPE
_UNSIGNED_ENUMERATION) {
g_string_append_printf(pretty->string, "%" PRIu64, v.u);
} else {
g_string_append_printf(pretty->string, "%" PRId64, v.s);
g_string_append_printf(pretty->string, "%" PRIu64, v.u);
} else {
g_string_append_printf(pretty->string, "%" PRId64, v.s);
@@
-727,12
+727,12
@@
enum bt_component_status print_enum(struct pretty_component *pretty,
goto end;
}
goto end;
}
- switch (bt_field_get_class_
id
(field)) {
- case BT_FIELD_CLASS_
ID
_UNSIGNED_ENUMERATION:
+ switch (bt_field_get_class_
type
(field)) {
+ case BT_FIELD_CLASS_
TYPE
_UNSIGNED_ENUMERATION:
ret = bt_field_unsigned_enumeration_get_mapping_labels(field,
&label_array, &label_count);
break;
ret = bt_field_unsigned_enumeration_get_mapping_labels(field,
&label_array, &label_count);
break;
- case BT_FIELD_CLASS_
ID
_SIGNED_ENUMERATION:
+ case BT_FIELD_CLASS_
TYPE
_SIGNED_ENUMERATION:
ret = bt_field_signed_enumeration_get_mapping_labels(field,
&label_array, &label_count);
break;
ret = bt_field_signed_enumeration_get_mapping_labels(field,
&label_array, &label_count);
break;
@@
-1010,14
+1010,14
@@
enum bt_component_status print_field(struct pretty_component *pretty,
struct bt_field *field, bool print_names,
GQuark *filter_fields, int filter_array_len)
{
struct bt_field *field, bool print_names,
GQuark *filter_fields, int filter_array_len)
{
- enum bt_field_class_
id
class_id;
+ enum bt_field_class_
type
class_id;
- class_id = bt_field_get_class_
id
(field);
+ class_id = bt_field_get_class_
type
(field);
switch (class_id) {
switch (class_id) {
- case BT_FIELD_CLASS_
ID
_UNSIGNED_INTEGER:
- case BT_FIELD_CLASS_
ID
_SIGNED_INTEGER:
+ case BT_FIELD_CLASS_
TYPE
_UNSIGNED_INTEGER:
+ case BT_FIELD_CLASS_
TYPE
_SIGNED_INTEGER:
return print_integer(pretty, field);
return print_integer(pretty, field);
- case BT_FIELD_CLASS_
ID
_REAL:
+ case BT_FIELD_CLASS_
TYPE
_REAL:
{
double v;
{
double v;
@@
-1031,10
+1031,10
@@
enum bt_component_status print_field(struct pretty_component *pretty,
}
return BT_COMPONENT_STATUS_OK;
}
}
return BT_COMPONENT_STATUS_OK;
}
- case BT_FIELD_CLASS_
ID
_UNSIGNED_ENUMERATION:
- case BT_FIELD_CLASS_
ID
_SIGNED_ENUMERATION:
+ case BT_FIELD_CLASS_
TYPE
_UNSIGNED_ENUMERATION:
+ case BT_FIELD_CLASS_
TYPE
_SIGNED_ENUMERATION:
return print_enum(pretty, field);
return print_enum(pretty, field);
- case BT_FIELD_CLASS_
ID
_STRING:
+ case BT_FIELD_CLASS_
TYPE
_STRING:
{
const char *str;
{
const char *str;
@@
-1052,14
+1052,14
@@
enum bt_component_status print_field(struct pretty_component *pretty,
}
return BT_COMPONENT_STATUS_OK;
}
}
return BT_COMPONENT_STATUS_OK;
}
- case BT_FIELD_CLASS_
ID
_STRUCTURE:
+ case BT_FIELD_CLASS_
TYPE
_STRUCTURE:
return print_struct(pretty, field, print_names, filter_fields,
filter_array_len);
return print_struct(pretty, field, print_names, filter_fields,
filter_array_len);
- case BT_FIELD_CLASS_
ID
_VARIANT:
+ case BT_FIELD_CLASS_
TYPE
_VARIANT:
return print_variant(pretty, field, print_names);
return print_variant(pretty, field, print_names);
- case BT_FIELD_CLASS_
ID
_STATIC_ARRAY:
+ case BT_FIELD_CLASS_
TYPE
_STATIC_ARRAY:
return print_array(pretty, field, print_names);
return print_array(pretty, field, print_names);
- case BT_FIELD_CLASS_
ID
_DYNAMIC_ARRAY:
+ case BT_FIELD_CLASS_
TYPE
_DYNAMIC_ARRAY:
return print_sequence(pretty, field, print_names);
default:
// TODO: log instead
return print_sequence(pretty, field, print_names);
default:
// TODO: log instead
This page took
0.029522 seconds
and
4
git commands to generate.