X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-network%2Ftest-dhcp-option.c;h=46c8c2706148dd7357ee6418b797443a6e9b13b2;hb=c1ff5570f4a04bb9aedea444c12dce81679224ec;hp=7a0fac8d338a2f19357f07f978c2520272b89e7a;hpb=86be3e1e6558f4e7e20c537e644656eb6f37b7d0;p=elogind.git diff --git a/src/libsystemd-network/test-dhcp-option.c b/src/libsystemd-network/test-dhcp-option.c index 7a0fac8d3..46c8c2706 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); @@ -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); @@ -343,7 +344,7 @@ static void test_option_set(void) for (i = 0; i < 9; i++) { if (verbose) - printf("%2d: 0x%02x(0x%02x) (options)\n", i, result->options[i], + printf("%2u: 0x%02x(0x%02x) (options)\n", i, result->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) - printf("%2d: 0x%02x(0x%02x) (sname)\n", i, result->sname[i], + printf("%2u: 0x%02x(0x%02x) (sname)\n", i, result->sname[i], options[i + 9]); assert_se(result->sname[i] == options[i + 9]); }