mirror of
https://git.libssh.org/projects/libssh.git
synced 2026-03-24 20:40:09 +09:00
Use ARRAY_SIZE systematically
Signed-off-by: Jakub Jelen <jjelen@redhat.com> Reviewed-by: Eshan Kelkar <eshankelkar@galorithm.com>
This commit is contained in:
@@ -127,7 +127,7 @@ static void torture_ssh_buffer_get_ssh_string(void **state)
|
||||
(void)state;
|
||||
|
||||
memset(data, 'X', sizeof(data));
|
||||
for (i = 0; i < (int)(sizeof(values) / sizeof(values[0])); ++i) {
|
||||
for (i = 0; i < (int)ARRAY_SIZE(values); ++i) {
|
||||
for (j = 0; j < (int)sizeof(data); ++j) {
|
||||
for (k = 1; k < 5; ++k) {
|
||||
buffer = ssh_buffer_new();
|
||||
|
||||
@@ -584,7 +584,7 @@ torture_match_cidr_address_list_ipv6(void **state)
|
||||
(void)state;
|
||||
|
||||
/* Test valid link-local addresses */
|
||||
valid_addr_len = sizeof(valid_addr) / sizeof(valid_addr[0]);
|
||||
valid_addr_len = ARRAY_SIZE(valid_addr);
|
||||
for (i = 0; i < valid_addr_len; i++) {
|
||||
rc = match_cidr_address_list(valid_addr[i], IPV6_LIST, AF_INET6);
|
||||
assert_int_equal(rc, 1);
|
||||
@@ -601,7 +601,7 @@ torture_match_cidr_address_list_ipv6(void **state)
|
||||
assert_int_equal(rc, 1);
|
||||
|
||||
/* Test some invalid input */
|
||||
invalid_addr_len = sizeof(invalid_addr) / sizeof(invalid_addr[0]);
|
||||
invalid_addr_len = ARRAY_SIZE(invalid_addr);
|
||||
for (i = 0; i < invalid_addr_len; i++) {
|
||||
rc = match_cidr_address_list(invalid_addr[i], IPV6_LIST, AF_INET6);
|
||||
assert_int_equal(rc, 0);
|
||||
|
||||
@@ -142,8 +142,7 @@ static int setup_sshsig_compat(void **state)
|
||||
test_state->original_cwd = original_cwd;
|
||||
test_state->temp_dir = temp_dir;
|
||||
test_state->test_combinations = test_combinations;
|
||||
test_state->num_combinations =
|
||||
sizeof(test_combinations) / sizeof(test_combinations[0]);
|
||||
test_state->num_combinations = ARRAY_SIZE(test_combinations);
|
||||
|
||||
*state = test_state;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user