shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

test-dhcp-option: inline iterator variable declarations

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-12-08 10:09:30 +01:00
parent 1a735f9b22
commit 874e525de4
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/libsystemd-network/test-dhcp-option.c
View File

@ -146,7 +146,6 @@ static int test_options_cb(uint8_t code, uint8_t len, const void *option, void *
int *desclen = NULL, *descpos = NULL; int *desclen = NULL, *descpos = NULL;
uint8_t optcode = 0; uint8_t optcode = 0;
uint8_t optlen = 0; uint8_t optlen = 0;
uint8_t i;
assert_se((!desc && !code && !len) || desc); assert_se((!desc && !code && !len) || desc);
@ -199,10 +198,10 @@ static int test_options_cb(uint8_t code, uint8_t len, const void *option, void *
assert_se(code == optcode); assert_se(code == optcode);
assert_se(len == optlen); assert_se(len == optlen);
for (i = 0; i < len; i++) { for (unsigned i = 0; i < len; i++) {
if (verbose) if (verbose)
printf("0x%02x(0x%02x) ", ((uint8_t*) option)[i], printf("0x%02x(0x%02x) ",
((uint8_t*) option)[i],
descoption[*descpos + 2 + i]); descoption[*descpos + 2 + i]);
assert_se(((uint8_t*) option)[i] == descoption[*descpos + 2 + i]); assert_se(((uint8_t*) option)[i] == descoption[*descpos + 2 + i]);
@ -292,7 +291,6 @@ static uint8_t the_options[64] = {
static void test_option_set(void) { static void test_option_set(void) {
_cleanup_free_ DHCPMessage *result = NULL; _cleanup_free_ DHCPMessage *result = NULL;
size_t offset = 0, len, pos; size_t offset = 0, len, pos;
unsigned i;
result = malloc0(sizeof(DHCPMessage) + 11); result = malloc0(sizeof(DHCPMessage) + 11);
assert_se(result); assert_se(result);
@ -331,7 +329,7 @@ static void test_option_set(void) {
assert_se(offset == pos); assert_se(offset == pos);
} }
for (i = 0; i < 9; i++) { for (unsigned i = 0; i < 9; i++) {
if (verbose) if (verbose)
printf("%2u: 0x%02x(0x%02x) (options)\n", i, result->options[i], printf("%2u: 0x%02x(0x%02x) (options)\n", i, result->options[i],
the_options[i]); the_options[i]);
@ -350,7 +348,7 @@ static void test_option_set(void) {
assert_se(result->options[10] == SD_DHCP_OPTION_PAD); assert_se(result->options[10] == SD_DHCP_OPTION_PAD);
for (i = 0; i < pos - 8; i++) { for (unsigned i = 0; i < pos - 8; i++) {
if (verbose) if (verbose)
printf("%2u: 0x%02x(0x%02x) (sname)\n", i, result->sname[i], printf("%2u: 0x%02x(0x%02x) (sname)\n", i, result->sname[i],
the_options[i + 9]); the_options[i + 9]);
@ -362,19 +360,17 @@ static void test_option_set(void) {
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
unsigned i;
test_invalid_buffer_length(); test_invalid_buffer_length();
test_message_init(); test_message_init();
test_options(NULL); test_options(NULL);
for (i = 0; i < ELEMENTSOF(option_tests); i++) for (unsigned i = 0; i < ELEMENTSOF(option_tests); i++)
test_options(&option_tests[i]); test_options(&option_tests[i]);
test_option_set(); test_option_set();
for (i = 0; i < ELEMENTSOF(option_tests); i++) { for (unsigned i = 0; i < ELEMENTSOF(option_tests); i++) {
struct option_desc *desc = &option_tests[i]; struct option_desc *desc = &option_tests[i];
if (!desc->success || desc->snamelen > 0 || desc->filelen > 0) if (!desc->success || desc->snamelen > 0 || desc->filelen > 0)
continue; continue;