projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove bitfields, which are just a bit-addressed integer
[babeltrace.git]
/
formats
/
ctf
/
types
/
enum.c
diff --git
a/formats/ctf/types/enum.c
b/formats/ctf/types/enum.c
index 256807a7f0e2c30e0ba60980494f6e9aad905167..37859f03a5afb040cc90abfeab9ebbd674a9ce0e 100644
(file)
--- a/
formats/ctf/types/enum.c
+++ b/
formats/ctf/types/enum.c
@@
-24,52
+24,39
@@
#include <stdint.h>
#include <glib.h>
#include <stdint.h>
#include <glib.h>
-GQuark ctf_enum_read(
const unsigned char *ptr
,
+GQuark ctf_enum_read(
struct stream_pos *pos
,
const struct type_class_enum *src)
{
const struct type_class_enum *src)
{
- struct type_class_bitfield *bitfield_class = &src->p;
- struct type_class_integer *int_class = &bitfield_class->p;
+ struct type_class_integer *int_class = &src->p;
if (!int_class->signedness) {
uint64_t v;
if (!int_class->signedness) {
uint64_t v;
- v = ctf_bitfield_unsigned_read(src,
- bitfield_class->start_offset,
- int_class->len,
- int_class->byte_order);
+ v = ctf_uint_read(pos, int_class);
return enum_uint_to_quark(src, v);
} else {
int64_t v;
return enum_uint_to_quark(src, v);
} else {
int64_t v;
- v = fsrc->bitfield_signed_read(src,
- bitfield_class->start_offset,
- int_class->len,
- int_class->byte_order);
+ v = fsrc->ctf_int_read(pos, int_class);
return enum_int_to_quark(src, v);
}
}
return enum_int_to_quark(src, v);
}
}
-size_t ctf_enum_write(unsigned char *ptr, const struct type_class_enum *dest,
+size_t ctf_enum_write(struct stream_pos *pos,
+ const struct type_class_enum *dest,
GQuark q)
{
GQuark q)
{
- struct type_class_bitfield *bitfield_class = &dest->p;
- struct type_class_integer *int_class = &bitfield_class->p;
+ struct type_class_integer *int_class = &dest->p;
if (!int_class->signedness) {
uint64_t v;
v = enum_quark_to_uint(dest, q);
if (!int_class->signedness) {
uint64_t v;
v = enum_quark_to_uint(dest, q);
- return ctf_bitfield_unsigned_write(src,
- bitfield_class->start_offset,
- int_class->len,
- int_class->byte_order, v);
+ return ctf_uint_write(pos, int_class, v);
} else {
int64_t v;
v = enum_quark_to_int(dest, q);
} else {
int64_t v;
v = enum_quark_to_int(dest, q);
- return ctf_bitfield_signed_write(src,
- bitfield_class->start_offset,
- int_class->len,
- int_class->byte_order, v);
+ return ctf_int_write(pos, int_class, v);
}
}
}
}
This page took
0.024577 seconds
and
4
git commands to generate.