X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-network%2Ftest-dhcp-option.c;h=eac3844f96b8ad620c0f116b4cc46bbca3598707;hb=d0a2e1c364320b862a6aae099afa106ea59bb84c;hp=4482a6783cb4ae02068e4f60e5476a9e00b8e5b2;hpb=04b28be1a306fd2ba454d3ee333d63df71aa3873;p=elogind.git diff --git a/src/libsystemd-network/test-dhcp-option.c b/src/libsystemd-network/test-dhcp-option.c index 4482a6783..eac3844f9 100644 --- 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, - DHCP_DISCOVER, optlen, &optoffset) >= 0); + DHCP_DISCOVER, ARPHRD_ETHER, optlen, &optoffset) >= 0); 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); - 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); } @@ -115,6 +115,7 @@ static DHCPMessage *create_message(uint8_t *options, uint16_t optlen, size_t len = sizeof(DHCPMessage) + optlen; message = malloc0(len); + assert_se(message); if (options && optlen) memcpy(&message->options, options, optlen); @@ -300,7 +301,7 @@ static uint8_t options[64] = { static void test_option_set(void) { - DHCPMessage *result; + _cleanup_free_ DHCPMessage *result = NULL; size_t offset = 0, len, pos; unsigned i;