msgbuf: Enable pldm_msgbuf_extract() into packed members
`pldm_msgbuf_extract()` should work correctly regardless of whether the
`dst` argument is a member of a packed or padded struct.
To get there while still achieving type safety we have to jump through
some hoops. Commentary in the patch hopefully captures many of them, but
a side-effect of the hoop-jumping is a couple of changes to ergonomics
of the msgbuf API:
1. `pldm_msgbuf_extract()` no-longer requires that the `dst`
argument be a pointer. Instead, it must be an lvalue, removing all
the `&<lvalue>` noise from the call-sites.
2. However, unfortunately the generic extraction macro has been split in
two. We now have:
2.1 `pldm_msgbuf_extract()`, and
2.2 `pldm_msgbuf_extract_p()`, for when the reference we already have
for the `dst` object is a pointer and not an lvalue.
The split was necessary because I couldn't get GCC and Clang to play
nice with differences required in the assignment expression for lvalue
and pointer type-names in the one macro. Whilst it causes a bunch of
churn it isn't a great concern as the APIs are purely internal to the
library implementation.
Change-Id: Ifc5440a5b838a48bb84c881ec334d9e145365edb
Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
Signed-off-by: Thu Nguyen <thu@os.amperecomputing.com>
diff --git a/tests/msgbuf_generic.c b/tests/msgbuf_generic.c
index 3307917..9119273 100644
--- a/tests/msgbuf_generic.c
+++ b/tests/msgbuf_generic.c
@@ -35,7 +35,7 @@
expect(pldm_msgbuf_init(ctx, sizeof(buf), buf, sizeof(buf)) ==
PLDM_SUCCESS);
- expect(pldm_msgbuf_extract(ctx, &val) == PLDM_SUCCESS);
+ expect(pldm_msgbuf_extract(ctx, val) == PLDM_SUCCESS);
expect(val == 0xa5);
expect(pldm_msgbuf_destroy(ctx) == PLDM_SUCCESS);
}
@@ -49,7 +49,7 @@
expect(pldm_msgbuf_init(ctx, sizeof(buf), buf, sizeof(buf)) ==
PLDM_SUCCESS);
- expect(pldm_msgbuf_extract(ctx, &val) == PLDM_SUCCESS);
+ expect(pldm_msgbuf_extract(ctx, val) == PLDM_SUCCESS);
expect(val == -1);
expect(pldm_msgbuf_destroy(ctx) == PLDM_SUCCESS);
}
@@ -63,7 +63,7 @@
expect(pldm_msgbuf_init(ctx, sizeof(buf), buf, sizeof(buf)) ==
PLDM_SUCCESS);
- expect(pldm_msgbuf_extract(ctx, &val) == PLDM_SUCCESS);
+ expect(pldm_msgbuf_extract(ctx, val) == PLDM_SUCCESS);
expect(val == 0x5aa5);
expect(pldm_msgbuf_destroy(ctx) == PLDM_SUCCESS);
}
@@ -77,7 +77,7 @@
expect(pldm_msgbuf_init(ctx, sizeof(buf), buf, sizeof(buf)) ==
PLDM_SUCCESS);
- expect(pldm_msgbuf_extract(ctx, &val) == PLDM_SUCCESS);
+ expect(pldm_msgbuf_extract(ctx, val) == PLDM_SUCCESS);
expect(val == INT16_MIN);
expect(pldm_msgbuf_destroy(ctx) == PLDM_SUCCESS);
}
@@ -91,7 +91,7 @@
expect(pldm_msgbuf_init(ctx, sizeof(buf), buf, sizeof(buf)) ==
PLDM_SUCCESS);
- expect(pldm_msgbuf_extract(ctx, &val) == PLDM_SUCCESS);
+ expect(pldm_msgbuf_extract(ctx, val) == PLDM_SUCCESS);
expect(val == 0x5a00ffa5);
expect(pldm_msgbuf_destroy(ctx) == PLDM_SUCCESS);
}
@@ -105,7 +105,7 @@
expect(pldm_msgbuf_init(ctx, sizeof(buf), buf, sizeof(buf)) ==
PLDM_SUCCESS);
- expect(pldm_msgbuf_extract(ctx, &val) == PLDM_SUCCESS);
+ expect(pldm_msgbuf_extract(ctx, val) == PLDM_SUCCESS);
expect(val == INT32_MIN);
expect(pldm_msgbuf_destroy(ctx) == PLDM_SUCCESS);
}
@@ -125,7 +125,7 @@
expect(pldm_msgbuf_init(ctx, sizeof(buf), buf, sizeof(buf)) ==
PLDM_SUCCESS);
- expect(pldm_msgbuf_extract(ctx, &val) == PLDM_SUCCESS);
+ expect(pldm_msgbuf_extract(ctx, val) == PLDM_SUCCESS);
expect(val == FLT_MAX);
expect(pldm_msgbuf_destroy(ctx) == PLDM_SUCCESS);
}
@@ -159,7 +159,7 @@
struct pldm_msgbuf* ctxExtract = &_ctxExtract;
expect(pldm_msgbuf_init(ctxExtract, 0, buf, sizeof(buf)) == PLDM_SUCCESS);
- expect(pldm_msgbuf_extract(ctxExtract, &checkVal) == PLDM_SUCCESS);
+ expect(pldm_msgbuf_extract(ctxExtract, checkVal) == PLDM_SUCCESS);
expect(src == checkVal);
expect(pldm_msgbuf_destroy(ctxExtract) == PLDM_SUCCESS);
@@ -181,7 +181,7 @@
struct pldm_msgbuf* ctxExtract = &_ctxExtract;
expect(pldm_msgbuf_init(ctxExtract, 0, buf, sizeof(buf)) == PLDM_SUCCESS);
- expect(pldm_msgbuf_extract(ctxExtract, &checkVal) == PLDM_SUCCESS);
+ expect(pldm_msgbuf_extract(ctxExtract, checkVal) == PLDM_SUCCESS);
expect(src == checkVal);
expect(pldm_msgbuf_destroy(ctxExtract) == PLDM_SUCCESS);
@@ -203,7 +203,7 @@
struct pldm_msgbuf* ctxExtract = &_ctxExtract;
expect(pldm_msgbuf_init(ctxExtract, 0, buf, sizeof(buf)) == PLDM_SUCCESS);
- expect(pldm_msgbuf_extract(ctxExtract, &checkVal) == PLDM_SUCCESS);
+ expect(pldm_msgbuf_extract(ctxExtract, checkVal) == PLDM_SUCCESS);
expect(src == checkVal);
expect(pldm_msgbuf_destroy(ctxExtract) == PLDM_SUCCESS);
@@ -225,7 +225,7 @@
struct pldm_msgbuf* ctxExtract = &_ctxExtract;
expect(pldm_msgbuf_init(ctxExtract, 0, buf, sizeof(buf)) == PLDM_SUCCESS);
- expect(pldm_msgbuf_extract(ctxExtract, &checkVal) == PLDM_SUCCESS);
+ expect(pldm_msgbuf_extract(ctxExtract, checkVal) == PLDM_SUCCESS);
expect(src == checkVal);
expect(pldm_msgbuf_destroy(ctxExtract) == PLDM_SUCCESS);
@@ -247,7 +247,7 @@
struct pldm_msgbuf* ctxExtract = &_ctxExtract;
expect(pldm_msgbuf_init(ctxExtract, 0, buf, sizeof(buf)) == PLDM_SUCCESS);
- expect(pldm_msgbuf_extract(ctxExtract, &checkVal) == PLDM_SUCCESS);
+ expect(pldm_msgbuf_extract(ctxExtract, checkVal) == PLDM_SUCCESS);
expect(src == checkVal);
expect(pldm_msgbuf_destroy(ctxExtract) == PLDM_SUCCESS);
@@ -269,7 +269,7 @@
struct pldm_msgbuf* ctxExtract = &_ctxExtract;
expect(pldm_msgbuf_init(ctxExtract, 0, buf, sizeof(buf)) == PLDM_SUCCESS);
- expect(pldm_msgbuf_extract(ctxExtract, &checkVal) == PLDM_SUCCESS);
+ expect(pldm_msgbuf_extract(ctxExtract, checkVal) == PLDM_SUCCESS);
expect(src == checkVal);
expect(pldm_msgbuf_destroy(ctxExtract) == PLDM_SUCCESS);