chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
network-intenal: user _cleanup_ macro in parse_ifname
[elogind.git]
/
src
/
libsystemd-network
/
test-dhcp-option.c
diff --git
a/src/libsystemd-network/test-dhcp-option.c
b/src/libsystemd-network/test-dhcp-option.c
index 4482a6783cb4ae02068e4f60e5476a9e00b8e5b2..46c8c2706148dd7357ee6418b797443a6e9b13b2 100644
(file)
--- a/
src/libsystemd-network/test-dhcp-option.c
+++ b/
src/libsystemd-network/test-dhcp-option.c
@@
-92,7
+92,7
@@
static void test_message_init(void)
message = malloc0(len);
assert_se(dhcp_message_init(message, BOOTREQUEST, 0x12345678,
message = malloc0(len);
assert_se(dhcp_message_init(message, BOOTREQUEST, 0x12345678,
- DHCP_DISCOVER, optlen, &optoffset) >= 0);
+ DHCP_DISCOVER,
ARPHRD_ETHER,
optlen, &optoffset) >= 0);
assert_se(message->xid == htobe32(0x12345678));
assert_se(message->op == BOOTREQUEST);
assert_se(message->xid == htobe32(0x12345678));
assert_se(message->op == BOOTREQUEST);
@@
-100,9
+100,9
@@
static void test_message_init(void)
magic = (uint8_t*)&message->magic;
assert_se(magic[0] == 99);
magic = (uint8_t*)&message->magic;
assert_se(magic[0] == 99);
- assert_se(magic[1] = 130);
- assert_se(magic[2] = 83);
- assert_se(magic[3] = 99);
+ assert_se(magic[1] =
=
130);
+ assert_se(magic[2] =
=
83);
+ assert_se(magic[3] =
=
99);
assert_se(dhcp_option_parse(message, len, NULL, NULL) >= 0);
}
assert_se(dhcp_option_parse(message, len, NULL, NULL) >= 0);
}
@@
-115,6
+115,7
@@
static DHCPMessage *create_message(uint8_t *options, uint16_t optlen,
size_t len = sizeof(DHCPMessage) + optlen;
message = malloc0(len);
size_t len = sizeof(DHCPMessage) + optlen;
message = malloc0(len);
+ assert_se(message);
if (options && optlen)
memcpy(&message->options, options, optlen);
if (options && optlen)
memcpy(&message->options, options, optlen);
@@
-300,7
+301,7
@@
static uint8_t options[64] = {
static void test_option_set(void)
{
static void test_option_set(void)
{
-
DHCPMessage *result
;
+
_cleanup_free_ DHCPMessage *result = NULL
;
size_t offset = 0, len, pos;
unsigned i;
size_t offset = 0, len, pos;
unsigned i;
@@
-343,7
+344,7
@@
static void test_option_set(void)
for (i = 0; i < 9; i++) {
if (verbose)
for (i = 0; i < 9; i++) {
if (verbose)
- printf("%2
d
: 0x%02x(0x%02x) (options)\n", i, result->options[i],
+ printf("%2
u
: 0x%02x(0x%02x) (options)\n", i, result->options[i],
options[i]);
assert_se(result->options[i] == options[i]);
}
options[i]);
assert_se(result->options[i] == options[i]);
}
@@
-362,7
+363,7
@@
static void test_option_set(void)
for (i = 0; i < pos - 8; i++) {
if (verbose)
for (i = 0; i < pos - 8; i++) {
if (verbose)
- printf("%2
d
: 0x%02x(0x%02x) (sname)\n", i, result->sname[i],
+ printf("%2
u
: 0x%02x(0x%02x) (sname)\n", i, result->sname[i],
options[i + 9]);
assert_se(result->sname[i] == options[i + 9]);
}
options[i + 9]);
assert_se(result->sname[i] == options[i + 9]);
}